summaryrefslogtreecommitdiff
path: root/toxav/video.c
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2015-05-22 23:22:31 +0200
committermannol <eniz_vukovic@hotmail.com>2015-05-22 23:22:31 +0200
commit3100042a2b78f4f80d23f67e6113797cd8fb5df0 (patch)
treec226f4b25002784d93f9bb6415be4b55b76cddd1 /toxav/video.c
parent62c40af1a0c557ba8c77583c972ae3af9af15cf1 (diff)
parent2ba076ac5cc6efb5eb41fb4aa6a77a151885f26c (diff)
Updated with master
Diffstat (limited to 'toxav/video.c')
-rw-r--r--toxav/video.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/toxav/video.c b/toxav/video.c
index fe57387f..690b3bd4 100644
--- a/toxav/video.c
+++ b/toxav/video.c
@@ -42,7 +42,7 @@ typedef struct { uint16_t size; uint8_t data[]; } Payload;
42bool create_video_encoder (vpx_codec_ctx_t* dest, int32_t bit_rate); 42bool create_video_encoder (vpx_codec_ctx_t* dest, int32_t bit_rate);
43 43
44 44
45VCSession* vc_new(ToxAV* av, uint32_t friend_number, toxav_receive_video_frame_cb* cb, void* cb_data, uint32_t mvfpsz) 45VCSession* vc_new(ToxAV* av, uint32_t friend_number, toxav_video_receive_frame_cb* cb, void* cb_data, uint32_t mvfpsz)
46{ 46{
47 VCSession *vc = calloc(sizeof(VCSession), 1); 47 VCSession *vc = calloc(sizeof(VCSession), 1);
48 48
@@ -141,8 +141,9 @@ void vc_do(VCSession* vc)
141 for (; dest; dest = vpx_codec_get_frame(vc->decoder, &iter)) { 141 for (; dest; dest = vpx_codec_get_frame(vc->decoder, &iter)) {
142 if (vc->vcb.first) 142 if (vc->vcb.first)
143 vc->vcb.first(vc->av, vc->friend_number, dest->d_w, dest->d_h, 143 vc->vcb.first(vc->av, vc->friend_number, dest->d_w, dest->d_h,
144 (const uint8_t*)dest->planes[0], (const uint8_t*)dest->planes[1], (const uint8_t*)dest->planes[2], 144 (const uint8_t*)dest->planes[0], (const uint8_t*)dest->planes[1],
145 dest->stride[0], dest->stride[1], dest->stride[2], vc->vcb.second); 145 (const uint8_t*)dest->planes[2], (const uint8_t*)dest->planes[3],
146 dest->stride[0], dest->stride[1], dest->stride[2], dest->stride[3], vc->vcb.second);
146 147
147 vpx_img_free(dest); 148 vpx_img_free(dest);
148 } 149 }