Attachment #403920 for bug #540214

Lines 311-317 Link Here

(-)a/src/audio_aac.c (-1 / +1 lines)
311	return AUDIO_PROFILE_INVALID;	311	return AUDIO_PROFILE_INVALID;
312		312
313	/* check for AAC variants codec */	313	/* check for AAC variants codec */
314	if (ac->codec_id != CODEC_ID_AAC)	314	if (ac->codec_id != AV_CODEC_ID_AAC)
315	return AUDIO_PROFILE_INVALID;	315	return AUDIO_PROFILE_INVALID;
316		316
317	switch (type)	317	switch (type)

Lines 39-45 Link Here

(-)a/src/audio_ac3.c (-1 / +1 lines)
39	return AUDIO_PROFILE_INVALID;	39	return AUDIO_PROFILE_INVALID;
40		40
41	/* check for AC3 codec */	41	/* check for AC3 codec */
42	if (ac->codec_id != CODEC_ID_AC3)	42	if (ac->codec_id != AV_CODEC_ID_AC3)
43	return AUDIO_PROFILE_INVALID;	43	return AUDIO_PROFILE_INVALID;
44		44
45	/* supported channels: 1/0, 2/0, 3/0, 2/1, 3/1, 2/2, 3/2 */	45	/* supported channels: 1/0, 2/0, 3/0, 2/1, 3/1, 2/2, 3/2 */

Lines 53-59 Link Here

(-)a/src/audio_amr.c (-2 / +2 lines)
53	if (!ac)	53	if (!ac)
54	return 0;	54	return 0;
55		55
56	if (ac->codec_id != CODEC_ID_AMR_NB)	56	if (ac->codec_id != AV_CODEC_ID_AMR_NB)
57	return 0;	57	return 0;
58		58
59	/* only mono is supported */	59	/* only mono is supported */
Lines 89-95 Link Here
89	if (!ac)	89	if (!ac)
90	return 0;	90	return 0;
91		91
92	if (ac->codec_id != CODEC_ID_AMR_WB)	92	if (ac->codec_id != AV_CODEC_ID_AMR_WB)
93	return 0;	93	return 0;
94		94
95	/* valid sampling rates: 8, 16, 24, 32 and 48 kHz */	95	/* valid sampling rates: 8, 16, 24, 32 and 48 kHz */

Lines 39-45 Link Here

(-)a/src/audio_atrac3.c (-1 / +1 lines)
39	return AUDIO_PROFILE_INVALID;	39	return AUDIO_PROFILE_INVALID;
40		40
41	#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)	41	#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
42	if (ac->codec_id == CODEC_ID_ATRAC3)	42	if (ac->codec_id == AV_CODEC_ID_ATRAC3)
43	return AUDIO_PROFILE_ATRAC;	43	return AUDIO_PROFILE_ATRAC;
44	#endif	44	#endif
45		45

Lines 31-37 Link Here

(-)a/src/audio_g726.c (-1 / +1 lines)
31	if (!ac)	31	if (!ac)
32	return AUDIO_PROFILE_INVALID;	32	return AUDIO_PROFILE_INVALID;
33		33
34	if (ac->codec_id != CODEC_ID_ADPCM_G726)	34	if (ac->codec_id != AV_CODEC_ID_ADPCM_G726)
35	return AUDIO_PROFILE_INVALID;	35	return AUDIO_PROFILE_INVALID;
36		36
37	if (ac->channels != 1)	37	if (ac->channels != 1)

Lines 45-52 Link Here

(-)a/src/audio_lpcm.c (-2 / +2 lines)
45	return AUDIO_PROFILE_INVALID;	45	return AUDIO_PROFILE_INVALID;
46		46
47	/* check for 16-bit signed network-endian PCM codec */	47	/* check for 16-bit signed network-endian PCM codec */
48	if (ac->codec_id != CODEC_ID_PCM_S16BE &&	48	if (ac->codec_id != AV_CODEC_ID_PCM_S16BE &&
49	ac->codec_id != CODEC_ID_PCM_S16LE)	49	ac->codec_id != AV_CODEC_ID_PCM_S16LE)
50	return AUDIO_PROFILE_INVALID;	50	return AUDIO_PROFILE_INVALID;
51		51
52	/* supported channels: mono or stereo */	52	/* supported channels: mono or stereo */

Lines 31-37 Link Here

(-)a/src/audio_mp2.c (-1 / +1 lines)
31	if (!ac)	31	if (!ac)
32	return AUDIO_PROFILE_INVALID;	32	return AUDIO_PROFILE_INVALID;
33		33
34	if (ac->codec_id != CODEC_ID_MP2)	34	if (ac->codec_id != AV_CODEC_ID_MP2)
35	return AUDIO_PROFILE_INVALID;	35	return AUDIO_PROFILE_INVALID;
36		36
37	if (ac->channels > 5)	37	if (ac->channels > 5)

Lines 47-53 Link Here

(-)a/src/audio_mp3.c (-1 / +1 lines)
47	return 0;	47	return 0;
48		48
49	/* check for MP3 codec */	49	/* check for MP3 codec */
50	if (ac->codec_id != CODEC_ID_MP3)	50	if (ac->codec_id != AV_CODEC_ID_MP3)
51	return 0;	51	return 0;
52		52
53	/* only mono and stereo are supported */	53	/* only mono and stereo are supported */

Lines 55-61 Link Here

(-)a/src/audio_wma.c (-1 / +1 lines)
55	return ap;	55	return ap;
56		56
57	/* check for WMA codec */	57	/* check for WMA codec */
58	if (ac->codec_id != CODEC_ID_WMAV1 && ac->codec_id != CODEC_ID_WMAV2)	58	if (ac->codec_id != AV_CODEC_ID_WMAV1 && ac->codec_id != AV_CODEC_ID_WMAV2)
59	return ap;	59	return ap;
60		60
61	if (ac->sample_rate <= 48000)	61	if (ac->sample_rate <= 48000)

Lines 42-48 Link Here

(-)a/src/av_mpeg1.c (-2 / +2 lines)
42	return NULL;	42	return NULL;
43		43
44	/* check for MPEG-1 video codec */	44	/* check for MPEG-1 video codec */
45	if (codecs->vc->codec_id != CODEC_ID_MPEG1VIDEO)	45	if (codecs->vc->codec_id != AV_CODEC_ID_MPEG1VIDEO)
46	return NULL;	46	return NULL;
47		47
48	/* video bitrate must be CBR at 1,151,929.1 bps */	48	/* video bitrate must be CBR at 1,151,929.1 bps */
Lines 72-78 Link Here
72	return NULL;	72	return NULL;
73		73
74	/* check for MPEG-1 Layer-2 audio codec */	74	/* check for MPEG-1 Layer-2 audio codec */
75	if (codecs->ac->codec_id != CODEC_ID_MP2)	75	if (codecs->ac->codec_id != AV_CODEC_ID_MP2)
76	return NULL;	76	return NULL;
77		77
78	/* supported channels: stereo only */	78	/* supported channels: stereo only */




  int i;
  
  /* check for MPEG-2 MP@LL profile */
  if (codecs->ac->codec_id == AV_CODEC_ID_AAC)
  {
    /* 352x288 only */
    if (codecs->vc->width != 352 && codecs->vc->height != 288)

  if (ctx->bit_rate > 19392700)
    return NULL;

  if (codecs->ac->codec_id != AV_CODEC_ID_AC3)
    return NULL;

  /* 48 KHz only */

    return NULL;
  
  /* check for MPEG-2 video codec */
  if (codecs->vc->codec_id != AV_CODEC_ID_MPEG2VIDEO)
    return NULL;

  switch (st)

Lines 1221-1227 Link Here

(-)a/src/av_mpeg4_part10.c (-1 / +1 lines)
1221	return NULL;	1221	return NULL;
1222		1222
1223	/* check for H.264/AVC codec */	1223	/* check for H.264/AVC codec */
1224	if (codecs->vc->codec_id != CODEC_ID_H264)	1224	if (codecs->vc->codec_id != AV_CODEC_ID_H264)
1225	return NULL;	1225	return NULL;
1226		1226
1227	/* check for a supported container */	1227	/* check for a supported container */




  int codec_id;
  mpeg4_vcodec_type_t type;
} avf_vcodec_mapping[] = {
  { AV_CODEC_ID_H263,                      MPEG4_VCODEC_H263 },
  { AV_CODEC_ID_H263I,                     MPEG4_VCODEC_H263 },
  { AV_CODEC_ID_H263P,                     MPEG4_VCODEC_H263 },
  { AV_CODEC_ID_MPEG4,                     MPEG4_VCODEC_P2 },
  { AV_CODEC_ID_MSMPEG4V1,                 MPEG4_VCODEC_P2 },
  { AV_CODEC_ID_MSMPEG4V2,                 MPEG4_VCODEC_P2 },
  { AV_CODEC_ID_MSMPEG4V3,                 MPEG4_VCODEC_P2 },
  { -1, 0 }
};
   

Lines 245-251 Link Here

(-)a/src/av_wmv9.c (-1 / +1 lines)
245	return NULL;	245	return NULL;
246		246
247	/* check for WMV3 (Simple and Main profiles) video codec */	247	/* check for WMV3 (Simple and Main profiles) video codec */
248	if (codecs->vc->codec_id != CODEC_ID_WMV3)	248	if (codecs->vc->codec_id != AV_CODEC_ID_WMV3)
249	return NULL;	249	return NULL;
250		250
251	/* get video profile */	251	/* get video profile */

Lines 92-101 Link Here

(-)a/src/image_jpeg.c (-4 / +4 lines)
92	return NULL;	92	return NULL;
93		93
94	/* check for JPEG compliant codec */	94	/* check for JPEG compliant codec */
95	if (codecs->vc->codec_id != CODEC_ID_MJPEG &&	95	if (codecs->vc->codec_id != AV_CODEC_ID_MJPEG &&
96	codecs->vc->codec_id != CODEC_ID_MJPEGB &&	96	codecs->vc->codec_id != AV_CODEC_ID_MJPEGB &&
97	codecs->vc->codec_id != CODEC_ID_LJPEG &&	97	codecs->vc->codec_id != AV_CODEC_ID_LJPEG &&
98	codecs->vc->codec_id != CODEC_ID_JPEGLS)	98	codecs->vc->codec_id != AV_CODEC_ID_JPEGLS)
99	return NULL;	99	return NULL;
100		100
101	for (i = 0; jpeg_profiles_mapping[i].profile; i++)	101	for (i = 0; jpeg_profiles_mapping[i].profile; i++)

Lines 76-82 Link Here

(-)a/src/image_png.c (-1 / +1 lines)
76	return NULL;	76	return NULL;
77		77
78	/* check for PNG compliant codec */	78	/* check for PNG compliant codec */
79	if (codecs->vc->codec_id != CODEC_ID_PNG)	79	if (codecs->vc->codec_id != AV_CODEC_ID_PNG)
80	return NULL;	80	return NULL;
81		81
82	for (i = 0; png_profiles_mapping[i].profile; i++)	82	for (i = 0; png_profiles_mapping[i].profile; i++)

Return to bug 540214

Lines 453-459 Link Here

(-)a/src/av_mpeg2.c (-3 / +3 lines)
453	int i;	453	int i;
454		454
455	/* check for MPEG-2 MP@LL profile */	455	/* check for MPEG-2 MP@LL profile */
456	if (codecs->ac->codec_id == CODEC_ID_AAC)	456	if (codecs->ac->codec_id == AV_CODEC_ID_AAC)
457	{	457	{
458	/* 352x288 only */	458	/* 352x288 only */
459	if (codecs->vc->width != 352 && codecs->vc->height != 288)	459	if (codecs->vc->width != 352 && codecs->vc->height != 288)
Lines 535-541 Link Here
535	if (ctx->bit_rate > 19392700)	535	if (ctx->bit_rate > 19392700)
536	return NULL;	536	return NULL;
537		537
538	if (codecs->ac->codec_id != CODEC_ID_AC3)	538	if (codecs->ac->codec_id != AV_CODEC_ID_AC3)
539	return NULL;	539	return NULL;
540		540
541	/* 48 KHz only */	541	/* 48 KHz only */
Lines 615-621 Link Here
615	return NULL;	615	return NULL;
616		616
617	/* check for MPEG-2 video codec */	617	/* check for MPEG-2 video codec */
618	if (codecs->vc->codec_id != CODEC_ID_MPEG2VIDEO)	618	if (codecs->vc->codec_id != AV_CODEC_ID_MPEG2VIDEO)
619	return NULL;	619	return NULL;
620		620
621	switch (st)	621	switch (st)

Lines 42-54 Link Here

(-)a/src/av_mpeg4_part2.c (-7 / +7 lines)
42	int codec_id;	42	int codec_id;
43	mpeg4_vcodec_type_t type;	43	mpeg4_vcodec_type_t type;
44	} avf_vcodec_mapping[] = {	44	} avf_vcodec_mapping[] = {
45	{ CODEC_ID_H263, MPEG4_VCODEC_H263 },	45	{ AV_CODEC_ID_H263, MPEG4_VCODEC_H263 },
46	{ CODEC_ID_H263I, MPEG4_VCODEC_H263 },	46	{ AV_CODEC_ID_H263I, MPEG4_VCODEC_H263 },
47	{ CODEC_ID_H263P, MPEG4_VCODEC_H263 },	47	{ AV_CODEC_ID_H263P, MPEG4_VCODEC_H263 },
48	{ CODEC_ID_MPEG4, MPEG4_VCODEC_P2 },	48	{ AV_CODEC_ID_MPEG4, MPEG4_VCODEC_P2 },
49	{ CODEC_ID_MSMPEG4V1, MPEG4_VCODEC_P2 },	49	{ AV_CODEC_ID_MSMPEG4V1, MPEG4_VCODEC_P2 },
50	{ CODEC_ID_MSMPEG4V2, MPEG4_VCODEC_P2 },	50	{ AV_CODEC_ID_MSMPEG4V2, MPEG4_VCODEC_P2 },
51	{ CODEC_ID_MSMPEG4V3, MPEG4_VCODEC_P2 },	51	{ AV_CODEC_ID_MSMPEG4V3, MPEG4_VCODEC_P2 },
52	{ -1, 0 }	52	{ -1, 0 }
53	};	53	};
54		54