Unified · Split
| @@ -195,6 +195,7 @@ static const AVCodecTag nsv_codec_video_tags[] = { · 194 unmodified lines | |||
| 195 | { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, | 195 | { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, |
| 196 | */ | 196 | */ |
| 197 | { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ | 197 | { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ |
| 198 | { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, | ||
| 198 | { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, | 199 | { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, |
| 199 | { AV_CODEC_ID_NONE, 0 }, | 200 | { AV_CODEC_ID_NONE, 0 }, |
| 200 | }; | 201 | }; |
| @@ -203,6 +204,7 @@ static const AVCodecTag nsv_codec_audio_tags[] = { · 2 unmodified lines | |||
| 203 | { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, | 204 | { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, |
| 204 | { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, | 205 | { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, |
| 205 | { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, | 206 | { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, |
| 207 | { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'V', ' ') }, | ||
| 206 | { AV_CODEC_ID_AAC, MKTAG('V', 'L', 'B', ' ') }, | 208 | { AV_CODEC_ID_AAC, MKTAG('V', 'L', 'B', ' ') }, |
| 207 | { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, | 209 | { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, |
| 208 | { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, | 210 | { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, |
| @@ -461,6 +463,22 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) · 252 unmodified lines | |||
| 461 | st->codecpar->codec_tag = atag; | 463 | st->codecpar->codec_tag = atag; |
| 462 | st->codecpar->codec_id = ff_codec_get_id(nsv_codec_audio_tags, atag); | 464 | st->codecpar->codec_id = ff_codec_get_id(nsv_codec_audio_tags, atag); |
| 463 | 465 | ||
| 466 | if (atag == MKTAG('A', 'A', 'V', ' ')) { | ||
| 467 | static const uint8_t aav_pce[] = { | ||
| 468 | 0x12, 0x00, 0x05, 0x08, 0x48, 0x00, | ||
| 469 | 0x20, 0x00, 0xC6, 0x40, 0x04, 0x4C, | ||
| 470 | 0x61, 0x76, 0x63, 0x56, 0xE5, 0x00, | ||
| 471 | 0x00, 0x00, | ||
| 472 | }; | ||
| 473 | int ret; | ||
| 474 | |||
| 475 | if ((ret = ff_alloc_extradata(st->codecpar, sizeof(aav_pce))) < 0) | ||
| 476 | return ret; | ||
| 477 | |||
| 478 | st->codecpar->sample_rate = 44100; | ||
| 479 | memcpy(st->codecpar->extradata, aav_pce, sizeof(aav_pce)); | ||
| 480 | } | ||
| 481 | |||
| 464 | ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL; /* for PCM we will read a chunk later and put correct info */ | 482 | ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL; /* for PCM we will read a chunk later and put correct info */ |
| 465 | 483 | ||
| 466 | /* set timebase to common denominator of ms and framerate */ | 484 | /* set timebase to common denominator of ms and framerate */ |