Lines 47-52
Link Here
|
47 |
#define MAX_AUDIO_FRAME_SIZE 192000 |
47 |
#define MAX_AUDIO_FRAME_SIZE 192000 |
48 |
#endif |
48 |
#endif |
49 |
|
49 |
|
|
|
50 |
#if LIBAVCODEC_VERSION_MAJOR < 55 |
51 |
#define AV_CODEC_ID_VC1 CODEC_ID_VC1 |
52 |
#define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2 |
53 |
#define AV_CODEC_ID_WMAPRO CODEC_ID_WMAPRO |
54 |
#define AV_CODEC_ID_MP3 CODEC_ID_MP3 |
55 |
#define AV_CODEC_ID_MP2 CODEC_ID_MP2 |
56 |
#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO |
57 |
#define AV_CODEC_ID_WMV3 CODEC_ID_WMV3 |
58 |
#define AV_CODEC_ID_AAC CODEC_ID_AAC |
59 |
#define AV_CODEC_ID_H264 CODEC_ID_H264 |
60 |
#define AV_CODEC_ID_AC3 CODEC_ID_AC3 |
61 |
#endif |
62 |
|
63 |
|
50 |
typedef struct _TSMFFFmpegDecoder |
64 |
typedef struct _TSMFFFmpegDecoder |
51 |
{ |
65 |
{ |
52 |
ITSMFDecoder iface; |
66 |
ITSMFDecoder iface; |
Lines 213-240
static BOOL tsmf_ffmpeg_set_format(ITSMFDecoder *decoder, TS_AM_MEDIA_TYPE *medi
Link Here
|
213 |
switch(media_type->SubType) |
227 |
switch(media_type->SubType) |
214 |
{ |
228 |
{ |
215 |
case TSMF_SUB_TYPE_WVC1: |
229 |
case TSMF_SUB_TYPE_WVC1: |
216 |
mdecoder->codec_id = CODEC_ID_VC1; |
230 |
mdecoder->codec_id = AV_CODEC_ID_VC1; |
217 |
break; |
231 |
break; |
218 |
case TSMF_SUB_TYPE_WMA2: |
232 |
case TSMF_SUB_TYPE_WMA2: |
219 |
mdecoder->codec_id = CODEC_ID_WMAV2; |
233 |
mdecoder->codec_id = AV_CODEC_ID_WMAV2; |
220 |
break; |
234 |
break; |
221 |
case TSMF_SUB_TYPE_WMA9: |
235 |
case TSMF_SUB_TYPE_WMA9: |
222 |
mdecoder->codec_id = CODEC_ID_WMAPRO; |
236 |
mdecoder->codec_id = AV_CODEC_ID_WMAPRO; |
223 |
break; |
237 |
break; |
224 |
case TSMF_SUB_TYPE_MP3: |
238 |
case TSMF_SUB_TYPE_MP3: |
225 |
mdecoder->codec_id = CODEC_ID_MP3; |
239 |
mdecoder->codec_id = AV_CODEC_ID_MP3; |
226 |
break; |
240 |
break; |
227 |
case TSMF_SUB_TYPE_MP2A: |
241 |
case TSMF_SUB_TYPE_MP2A: |
228 |
mdecoder->codec_id = CODEC_ID_MP2; |
242 |
mdecoder->codec_id = AV_CODEC_ID_MP2; |
229 |
break; |
243 |
break; |
230 |
case TSMF_SUB_TYPE_MP2V: |
244 |
case TSMF_SUB_TYPE_MP2V: |
231 |
mdecoder->codec_id = CODEC_ID_MPEG2VIDEO; |
245 |
mdecoder->codec_id = AV_CODEC_ID_MPEG2VIDEO; |
232 |
break; |
246 |
break; |
233 |
case TSMF_SUB_TYPE_WMV3: |
247 |
case TSMF_SUB_TYPE_WMV3: |
234 |
mdecoder->codec_id = CODEC_ID_WMV3; |
248 |
mdecoder->codec_id = AV_CODEC_ID_WMV3; |
235 |
break; |
249 |
break; |
236 |
case TSMF_SUB_TYPE_AAC: |
250 |
case TSMF_SUB_TYPE_AAC: |
237 |
mdecoder->codec_id = CODEC_ID_AAC; |
251 |
mdecoder->codec_id = AV_CODEC_ID_AAC; |
238 |
/* For AAC the pFormat is a HEAACWAVEINFO struct, and the codec data |
252 |
/* For AAC the pFormat is a HEAACWAVEINFO struct, and the codec data |
239 |
is at the end of it. See |
253 |
is at the end of it. See |
240 |
http://msdn.microsoft.com/en-us/library/dd757806.aspx */ |
254 |
http://msdn.microsoft.com/en-us/library/dd757806.aspx */ |
Lines 246-255
static BOOL tsmf_ffmpeg_set_format(ITSMFDecoder *decoder, TS_AM_MEDIA_TYPE *medi
Link Here
|
246 |
break; |
260 |
break; |
247 |
case TSMF_SUB_TYPE_H264: |
261 |
case TSMF_SUB_TYPE_H264: |
248 |
case TSMF_SUB_TYPE_AVC1: |
262 |
case TSMF_SUB_TYPE_AVC1: |
249 |
mdecoder->codec_id = CODEC_ID_H264; |
263 |
mdecoder->codec_id = AV_CODEC_ID_H264; |
250 |
break; |
264 |
break; |
251 |
case TSMF_SUB_TYPE_AC3: |
265 |
case TSMF_SUB_TYPE_AC3: |
252 |
mdecoder->codec_id = CODEC_ID_AC3; |
266 |
mdecoder->codec_id = AV_CODEC_ID_AC3; |
253 |
break; |
267 |
break; |
254 |
default: |
268 |
default: |
255 |
return FALSE; |
269 |
return FALSE; |