Mercurial > mplayer.hg
annotate libmpcodecs/vd_theora.c @ 34493:da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
In case of 0-byte packets we do not need to call th_decode_ycbcr_out() to decode
the frame because we have a duplicated frame, and so we can use the last frame.
patch by Giorgio Vazzana, mywing81 gmail com
author | diego |
---|---|
date | Thu, 19 Jan 2012 14:36:17 +0000 |
parents | 55ff5df09657 |
children | 1c7446e6c426 |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
18 |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
19 #include <stdio.h> |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
20 #include <stdlib.h> |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
21 #include <stdarg.h> |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
22 #include <assert.h> |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
23 |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
24 #include "config.h" |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
25 #include "mp_msg.h" |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
26 #include "help_mp.h" |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
27 |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
28 #include "vd_internal.h" |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
29 |
30890 | 30 #include "libavutil/intreadwrite.h" |
31 | |
30504
cc27da5d7286
Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents:
30421
diff
changeset
|
32 static const vd_info_t info = { |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
33 "Theora/VP3", |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
34 "theora", |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
35 "David Kuehling", |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
36 "www.theora.org", |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
37 "Theora project's VP3 codec" |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
38 }; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
39 |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
40 LIBVD_EXTERN(theora) |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
41 |
34415 | 42 #include <theora/theoradec.h> |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
43 |
10658
c5e7b34bfc19
Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
alex
parents:
10251
diff
changeset
|
44 #define THEORA_NUM_HEADER_PACKETS 3 |
c5e7b34bfc19
Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
alex
parents:
10251
diff
changeset
|
45 |
30543
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
46 typedef struct theora_struct_st { |
34415 | 47 th_setup_info *tsi; |
48 th_dec_ctx *tctx; | |
49 th_comment tc; | |
50 th_info ti; | |
34493
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
51 th_ycbcr_buffer ycbcrbuf; |
30543
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
52 } theora_struct_t; |
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
53 |
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
54 /** Convert Theora pixelformat to the corresponding IMGFMT_ */ |
34415 | 55 static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt){ |
30543
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
56 switch(fmt) { |
34415 | 57 case TH_PF_420: return IMGFMT_YV12; |
58 case TH_PF_422: return IMGFMT_422P; | |
59 case TH_PF_444: return IMGFMT_444P; | |
30543
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
60 } |
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
61 return 0; |
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
62 } |
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
63 |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
64 // to set/get/query special features/parameters |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
65 static int control(sh_video_t *sh,int cmd,void* arg,...){ |
30543
ee0b9c3bbf29
Add support for decoding 4:2:2 and 4:4:4 Theora files.
reimar
parents:
30527
diff
changeset
|
66 theora_struct_t *context = sh->context; |
14763 | 67 switch(cmd) { |
68 case VDCTRL_QUERY_FORMAT: | |
34415 | 69 if (*(int*)arg == theora_pixelformat2imgfmt(context->ti.pixel_fmt)) |
14763 | 70 return CONTROL_TRUE; |
71 return CONTROL_FALSE; | |
72 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
21499
diff
changeset
|
73 |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
74 return CONTROL_UNKNOWN; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
75 } |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
76 |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
77 /* |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
78 * init driver |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
79 */ |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
80 static int init(sh_video_t *sh){ |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
81 theora_struct_t *context = NULL; |
30890 | 82 uint8_t *extradata = (uint8_t *)(sh->bih + 1); |
83 int extradata_size = sh->bih->biSize - sizeof(*sh->bih); | |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
84 int errorCode = 0; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
85 ogg_packet op; |
10658
c5e7b34bfc19
Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
alex
parents:
10251
diff
changeset
|
86 int i; |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
87 |
30527 | 88 context = calloc (sizeof (theora_struct_t), 1); |
89 sh->context = context; | |
90 if (!context) | |
91 goto err_out; | |
10658
c5e7b34bfc19
Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
alex
parents:
10251
diff
changeset
|
92 |
34415 | 93 th_info_init(&context->ti); |
94 th_comment_init(&context->tc); | |
95 context->tsi = NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
21499
diff
changeset
|
96 |
30527 | 97 /* Read all header packets, pass them to theora_decode_header. */ |
98 for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++) | |
99 { | |
30890 | 100 if (extradata_size > 2) { |
101 op.bytes = AV_RB16(extradata); | |
102 op.packet = extradata + 2; | |
103 op.b_o_s = 1; | |
104 if (extradata_size < op.bytes + 2) { | |
31188 | 105 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Theora header too small\n"); |
30890 | 106 goto err_out; |
107 } | |
108 extradata += op.bytes + 2; | |
109 extradata_size -= op.bytes + 2; | |
110 } else { | |
30891 | 111 op.bytes = ds_get_packet (sh->ds, &op.packet); |
112 op.b_o_s = 1; | |
30890 | 113 } |
114 | |
34415 | 115 if ( (errorCode = th_decode_headerin (&context->ti, &context->tc, &context->tsi, &op)) < 0) |
30527 | 116 { |
31188 | 117 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode); |
30526
68e260df472b
Just use goto instead of reimplementing it badly with a do { } while (0) and
reimar
parents:
30525
diff
changeset
|
118 goto err_out; |
30527 | 119 } |
120 } | |
10251
95dc2037fb27
just updated vd_theora.c to decode the additional header packets,
arpi
parents:
10094
diff
changeset
|
121 |
30527 | 122 /* now init codec */ |
34415 | 123 context->tctx = th_decode_alloc (&context->ti, context->tsi); |
124 if (!context->tctx) | |
30527 | 125 { |
34415 | 126 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode init failed\n"); |
30527 | 127 goto err_out; |
128 } | |
34415 | 129 /* free memory used for decoder setup information */ |
130 th_setup_free(context->tsi); | |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
131 |
34415 | 132 if(sh->aspect==0.0 && context->ti.aspect_denominator!=0) |
12761
236b49c548a5
Use aspect ratio from Theora context. Patch by j at v2v dot cc
mosu
parents:
10658
diff
changeset
|
133 { |
34415 | 134 sh->aspect = ((double)context->ti.aspect_numerator * context->ti.frame_width)/ |
135 ((double)context->ti.aspect_denominator * context->ti.frame_height); | |
12761
236b49c548a5
Use aspect ratio from Theora context. Patch by j at v2v dot cc
mosu
parents:
10658
diff
changeset
|
136 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
21499
diff
changeset
|
137 |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
138 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n"); |
34415 | 139 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Frame: %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->ti.frame_width, context->ti.frame_height, context->ti.pic_width, context->ti.pic_height, context->ti.pic_x, context->ti.pic_y); |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
140 |
34415 | 141 return mpcodecs_config_vo (sh,context->ti.frame_width,context->ti.frame_height,theora_pixelformat2imgfmt(context->ti.pixel_fmt)); |
30526
68e260df472b
Just use goto instead of reimplementing it badly with a do { } while (0) and
reimar
parents:
30525
diff
changeset
|
142 |
68e260df472b
Just use goto instead of reimplementing it badly with a do { } while (0) and
reimar
parents:
30525
diff
changeset
|
143 err_out: |
68e260df472b
Just use goto instead of reimplementing it badly with a do { } while (0) and
reimar
parents:
30525
diff
changeset
|
144 free(context); |
68e260df472b
Just use goto instead of reimplementing it badly with a do { } while (0) and
reimar
parents:
30525
diff
changeset
|
145 sh->context = NULL; |
68e260df472b
Just use goto instead of reimplementing it badly with a do { } while (0) and
reimar
parents:
30525
diff
changeset
|
146 return 0; |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
147 } |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
148 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
21499
diff
changeset
|
149 /* |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
150 * uninit driver |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
151 */ |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
152 static void uninit(sh_video_t *sh) |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
153 { |
30521 | 154 theora_struct_t *context = sh->context; |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
155 |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
156 if (context) |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
157 { |
34415 | 158 th_info_clear(&context->ti); |
159 th_comment_clear(&context->tc); | |
160 th_decode_free (context->tctx); | |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
161 free (context); |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
162 } |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
163 } |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
164 |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
165 /* |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
166 * decode frame |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
167 */ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
21499
diff
changeset
|
168 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
169 { |
30521 | 170 theora_struct_t *context = sh->context; |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
171 int errorCode = 0; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
172 ogg_packet op; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
173 mp_image_t* mpi; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
174 |
31149
8b1a6a6cda36
Avoid decoding of 0-size packets. This also fixes that the main loop believes
reimar
parents:
31134
diff
changeset
|
175 // no delayed frames |
8b1a6a6cda36
Avoid decoding of 0-size packets. This also fixes that the main loop believes
reimar
parents:
31134
diff
changeset
|
176 if (!data || !len) |
8b1a6a6cda36
Avoid decoding of 0-size packets. This also fixes that the main loop believes
reimar
parents:
31134
diff
changeset
|
177 return NULL; |
8b1a6a6cda36
Avoid decoding of 0-size packets. This also fixes that the main loop believes
reimar
parents:
31134
diff
changeset
|
178 |
14642
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
12761
diff
changeset
|
179 memset (&op, 0, sizeof (op)); |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
180 op.bytes = len; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
181 op.packet = data; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
182 op.granulepos = -1; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
183 |
34415 | 184 errorCode = th_decode_packetin (context->tctx, &op, NULL); |
185 if (errorCode < 0) | |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
186 { |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
187 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode packetin failed: %i \n", |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
188 errorCode); |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
189 return NULL; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
190 } |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
191 |
34493
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
192 if (errorCode != TH_DUPFRAME) { |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
193 errorCode = th_decode_ycbcr_out(context->tctx, context->ycbcrbuf); |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
194 if (errorCode != 0) { |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
195 mp_msg(MSGT_DECVIDEO, MSGL_ERR, |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
196 "Theora decode YUVout failed: %i \n", errorCode); |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
197 return NULL; |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
198 } |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
199 } |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
200 |
34493
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
201 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
202 context->ycbcrbuf[0].width, |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
203 context->ycbcrbuf[0].height); |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
204 if(!mpi) return NULL; |
14781 | 205 |
34493
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
206 mpi->planes[0] = context->ycbcrbuf[0].data; |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
207 mpi->stride[0] = context->ycbcrbuf[0].stride; |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
208 mpi->planes[1] = context->ycbcrbuf[1].data; |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
209 mpi->stride[1] = context->ycbcrbuf[1].stride; |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
210 mpi->planes[2] = context->ycbcrbuf[2].data; |
da31318562d9
vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames.
diego
parents:
34415
diff
changeset
|
211 mpi->stride[2] = context->ycbcrbuf[2].stride; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
21499
diff
changeset
|
212 |
10094
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
213 return mpi; |
5730f6098f98
theora video decoder, based on patch by David Kuehling <dvdkhlng@gmx.de>
arpi
parents:
diff
changeset
|
214 } |