Skip to content

F
ffmpeg.wasm-core
Commit e381cc3e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '1c88617b' 

* commit '1c88617b':
  riff: K&R formatting cosmetics

Conflicts:
	libavformat/riff.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents de9fbf3d 1c88617b
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 143 deletions
libavformat/riff.c
View file @ e381cc3e
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
/* Note: when encoding, the first matching tag is used, so order is /* Note: When encoding, the first matching tag is used, so order is
important if multiple tags possible for a given codec. * important if multiple tags are possible for a given codec.
Note also that this list is used for more than just riff, other * Note also that this list is used for more than just riff, other
files use it as well. * files use it as well.
*/ */
const AVCodecTag ff_codec_bmp_tags[] = { const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
{ AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, { AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') },
...@@ -52,7 +52,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -52,7 +52,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H263, MKTAG('M', '2', '6', '3') }, { AV_CODEC_ID_H263, MKTAG('M', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('l', 's', 'v', 'm') }, { AV_CODEC_ID_H263, MKTAG('l', 's', 'v', 'm') },
{ AV_CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, { AV_CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ { AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* Intel H.263 */
{ AV_CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, { AV_CODEC_ID_H261, MKTAG('H', '2', '6', '1') },
{ AV_CODEC_ID_H263, MKTAG('U', '2', '6', '3') }, { AV_CODEC_ID_H263, MKTAG('U', '2', '6', '3') },
{ AV_CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') }, { AV_CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') },
...@@ -61,8 +61,10 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -61,8 +61,10 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
{ AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
{ AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
{ AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ /* some broken AVIs use this */
{ AV_CODEC_ID_MPEG4, MKTAG('Z', 'M', 'P', '4') }, /* some broken avi use this */ { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) },
/* some broken AVIs use this */
{ AV_CODEC_ID_MPEG4, MKTAG('Z', 'M', 'P', '4') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') },
{ AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, { AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') },
{ AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
...@@ -71,7 +73,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -71,7 +73,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, { AV_CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') },
{ AV_CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, { AV_CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') },
{ AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') },
{ AV_CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') }, /* WaWv MPEG-4 Video Codec */ /* WaWv MPEG-4 Video Codec */
{ AV_CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, { AV_CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') },
{ AV_CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, { AV_CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, { AV_CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') },
...@@ -82,18 +85,22 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -82,18 +85,22 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, { AV_CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') },
{ AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') },
{ AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ /* flipped video */
{ AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, { AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') }, { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
{ AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') }, { AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
{ AV_CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */ /* Ephv MPEG-4 */
{ AV_CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') }, { AV_CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') },
{ AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */ /* Divio MPEG-4 */
{ AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') },
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') }, { AV_CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') },
{ AV_CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, { AV_CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, { AV_CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ /* Samsung SHR-6040 */
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') },
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'M', '4', 'V') }, { AV_CODEC_ID_MPEG4, MKTAG('S', 'M', '4', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') }, { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') }, { AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
...@@ -122,9 +129,12 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -122,9 +129,12 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */ /* Canopus DV */
{ AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */ { AV_CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', '5') }, /* Canopus DV */ /* Canopus DV */
{ AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') },
/* Canopus DV */
{ AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', '5') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
...@@ -144,10 +154,12 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -144,10 +154,12 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) }, { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ /* Lead MPEG-2 in AVI */
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */ /* Matrox MPEG-2 intra-only */
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */
...@@ -156,23 +168,31 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -156,23 +168,31 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, { AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
{ AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, { AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') },
{ AV_CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, { AV_CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ /* Pegasus lossless JPEG */
{ AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ { AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') },
/* JPEG-LS custom FOURCC for AVI - encoder */
{ AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') },
{ AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') }, { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ /* JPEG-LS custom FOURCC for AVI - decoder */
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') },
{ AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
{ AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
{ AV_CODEC_ID_AVRN, MKTAG('A', 'V', 'R', 'n') }, { AV_CODEC_ID_AVRN, MKTAG('A', 'V', 'R', 'n') },
{ AV_CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, { AV_CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
{ AV_CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, { AV_CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */ /* SL M-JPEG */
{ AV_CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ { AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') },
{ AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ /* Creative Webcam JPEG */
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ { AV_CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') },
/* Intel JPEG Library Video Codec */
{ AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') },
/* Midvid JPEG Video Codec */
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') },
{ AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') },
{ AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') },
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, { AV_CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') },
{ AV_CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ /* Paradigm Matrix M-JPEG Codec */
{ AV_CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'M', 'J', 'P') }, { AV_CODEC_ID_MJPEG, MKTAG('M', 'M', 'J', 'P') },
{ AV_CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { AV_CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ AV_CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { AV_CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
...@@ -202,7 +222,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -202,7 +222,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', ' ', ' ') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', ' ', ' ') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ /* SoftLab-NSK VideoTizer */
{ AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '1') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '1') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '1', '2') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '1', '2') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '2', '1') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '2', '1') },
...@@ -333,18 +354,21 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -333,18 +354,21 @@ const AVCodecTag ff_codec_bmp_tags[] = {
const AVCodecTag ff_codec_wav_tags[] = { const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_PCM_S16LE, 0x0001 }, { AV_CODEC_ID_PCM_S16LE, 0x0001 },
{ AV_CODEC_ID_PCM_U8, 0x0001 }, /* must come after s16le in this list */ /* must come after s16le in this list */
{ AV_CODEC_ID_PCM_U8, 0x0001 },
{ AV_CODEC_ID_PCM_S24LE, 0x0001 }, { AV_CODEC_ID_PCM_S24LE, 0x0001 },
{ AV_CODEC_ID_PCM_S32LE, 0x0001 }, { AV_CODEC_ID_PCM_S32LE, 0x0001 },
{ AV_CODEC_ID_ADPCM_MS, 0x0002 }, { AV_CODEC_ID_ADPCM_MS, 0x0002 },
{ AV_CODEC_ID_PCM_F32LE, 0x0003 }, { AV_CODEC_ID_PCM_F32LE, 0x0003 },
{ AV_CODEC_ID_PCM_F64LE, 0x0003 }, /* must come after f32le in this list */ /* must come after f32le in this list */
{ AV_CODEC_ID_PCM_F64LE, 0x0003 },
{ AV_CODEC_ID_PCM_ALAW, 0x0006 }, { AV_CODEC_ID_PCM_ALAW, 0x0006 },
{ AV_CODEC_ID_PCM_MULAW, 0x0007 }, { AV_CODEC_ID_PCM_MULAW, 0x0007 },
{ AV_CODEC_ID_WMAVOICE, 0x000A }, { AV_CODEC_ID_WMAVOICE, 0x000A },
{ AV_CODEC_ID_ADPCM_IMA_OKI, 0x0010 }, { AV_CODEC_ID_ADPCM_IMA_OKI, 0x0010 },
{ AV_CODEC_ID_ADPCM_IMA_WAV, 0x0011 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0011 },
{ AV_CODEC_ID_PCM_ZORK, 0x0011 }, /* must come after adpcm_ima_wav in this list */ /* must come after adpcm_ima_wav in this list */
{ AV_CODEC_ID_PCM_ZORK, 0x0011 },
{ AV_CODEC_ID_ADPCM_IMA_OKI, 0x0017 }, { AV_CODEC_ID_ADPCM_IMA_OKI, 0x0017 },
{ AV_CODEC_ID_ADPCM_YAMAHA, 0x0020 }, { AV_CODEC_ID_ADPCM_YAMAHA, 0x0020 },
{ AV_CODEC_ID_TRUESPEECH, 0x0022 }, { AV_CODEC_ID_TRUESPEECH, 0x0022 },
...@@ -356,8 +380,10 @@ const AVCodecTag ff_codec_wav_tags[] = { ...@@ -356,8 +380,10 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_MP3, 0x0055 }, { AV_CODEC_ID_MP3, 0x0055 },
{ AV_CODEC_ID_AMR_NB, 0x0057 }, { AV_CODEC_ID_AMR_NB, 0x0057 },
{ AV_CODEC_ID_AMR_WB, 0x0058 }, { AV_CODEC_ID_AMR_WB, 0x0058 },
{ AV_CODEC_ID_ADPCM_IMA_DK4, 0x0061 }, /* rogue format number */ /* rogue format number */
{ AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, /* rogue format number */ { AV_CODEC_ID_ADPCM_IMA_DK4, 0x0061 },
/* rogue format number */
{ AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 },
{ AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 },
{ AV_CODEC_ID_VOXWARE, 0x0075 }, { AV_CODEC_ID_VOXWARE, 0x0075 },
{ AV_CODEC_ID_AAC, 0x00ff }, { AV_CODEC_ID_AAC, 0x00ff },
...@@ -373,7 +399,8 @@ const AVCodecTag ff_codec_wav_tags[] = { ...@@ -373,7 +399,8 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_IAC, 0x0402 }, { AV_CODEC_ID_IAC, 0x0402 },
{ AV_CODEC_ID_GSM_MS, 0x1500 }, { AV_CODEC_ID_GSM_MS, 0x1500 },
{ AV_CODEC_ID_TRUESPEECH, 0x1501 }, { AV_CODEC_ID_TRUESPEECH, 0x1501 },
{ AV_CODEC_ID_AAC, 0x1600 }, /* ADTS AAC */ /* ADTS AAC */
{ AV_CODEC_ID_AAC, 0x1600 },
{ AV_CODEC_ID_AAC_LATM, 0x1602 }, { AV_CODEC_ID_AAC_LATM, 0x1602 },
{ AV_CODEC_ID_AC3, 0x2000 }, { AV_CODEC_ID_AC3, 0x2000 },
{ AV_CODEC_ID_DTS, 0x2001 }, { AV_CODEC_ID_DTS, 0x2001 },
...@@ -386,8 +413,9 @@ const AVCodecTag ff_codec_wav_tags[] = { ...@@ -386,8 +413,9 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_AAC, 0xA106 }, { AV_CODEC_ID_AAC, 0xA106 },
{ AV_CODEC_ID_SPEEX, 0xA109 }, { AV_CODEC_ID_SPEEX, 0xA109 },
{ AV_CODEC_ID_FLAC, 0xF1AC }, { AV_CODEC_ID_FLAC, 0xF1AC },
{ AV_CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' }, { AV_CODEC_ID_ADPCM_SWF, ('S' << 8) + 'F' },
{ AV_CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? /* HACK/FIXME: Does Vorbis in WAV/AVI have an (in)official ID? */
{ AV_CODEC_ID_VORBIS, ('V' << 8) + 'o' },
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
...@@ -411,7 +439,7 @@ const AVMetadataConv ff_riff_info_conv[] = { ...@@ -411,7 +439,7 @@ const AVMetadataConv ff_riff_info_conv[] = {
{ "IPRT", "track" }, { "IPRT", "track" },
{ "ISFT", "encoder" }, { "ISFT", "encoder" },
{ "ISMP", "timecode" }, { "ISMP", "timecode" },
{ "ITCH", "encoded_by"}, { "ITCH", "encoded_by" },
{ 0 }, { 0 },
}; };
...@@ -445,35 +473,35 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) ...@@ -445,35 +473,35 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
int hdrsize = 18; int hdrsize = 18;
int waveformatextensible; int waveformatextensible;
uint8_t temp[256]; uint8_t temp[256];
uint8_t *riff_extradata= temp; uint8_t *riff_extradata = temp;
uint8_t *riff_extradata_start= temp; uint8_t *riff_extradata_start = temp;
if(!enc->codec_tag || enc->codec_tag > 0xffff) if (!enc->codec_tag || enc->codec_tag > 0xffff)
return -1; return -1;
/* We use the known constant frame size for the codec if known, otherwise /* We use the known constant frame size for the codec if known, otherwise
fallback to using AVCodecContext.frame_size, which is not as reliable * fall back on using AVCodecContext.frame_size, which is not as reliable
for indicating packet duration */ * for indicating packet duration. */
frame_size = av_get_audio_frame_duration(enc, 0); frame_size = av_get_audio_frame_duration(enc, 0);
if (!frame_size) if (!frame_size)
frame_size = enc->frame_size; frame_size = enc->frame_size;
waveformatextensible = (enc->channels > 2 && enc->channel_layout) waveformatextensible = (enc->channels > 2 && enc->channel_layout) ||
|| enc->sample_rate > 48000 enc->sample_rate > 48000 ||
|| av_get_bits_per_sample(enc->codec_id) > 16; av_get_bits_per_sample(enc->codec_id) > 16;
if (waveformatextensible) { if (waveformatextensible)
avio_wl16(pb, 0xfffe); avio_wl16(pb, 0xfffe);
} else { else
avio_wl16(pb, enc->codec_tag); avio_wl16(pb, enc->codec_tag);
}
avio_wl16(pb, enc->channels); avio_wl16(pb, enc->channels);
avio_wl32(pb, enc->sample_rate); avio_wl32(pb, enc->sample_rate);
if (enc->codec_id == AV_CODEC_ID_ATRAC3 || if (enc->codec_id == AV_CODEC_ID_ATRAC3 ||
enc->codec_id == AV_CODEC_ID_G723_1 || enc->codec_id == AV_CODEC_ID_G723_1 ||
enc->codec_id == AV_CODEC_ID_GSM_MS ||
enc->codec_id == AV_CODEC_ID_MP2 || enc->codec_id == AV_CODEC_ID_MP2 ||
enc->codec_id == AV_CODEC_ID_MP3) { enc->codec_id == AV_CODEC_ID_MP3 ||
enc->codec_id == AV_CODEC_ID_GSM_MS) {
bps = 0; bps = 0;
} else { } else {
if (!(bps = av_get_bits_per_sample(enc->codec_id))) { if (!(bps = av_get_bits_per_sample(enc->codec_id))) {
...@@ -483,19 +511,23 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) ...@@ -483,19 +511,23 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
bps = 16; // default to 16 bps = 16; // default to 16
} }
} }
if(bps != enc->bits_per_coded_sample && enc->bits_per_coded_sample){ if (bps != enc->bits_per_coded_sample && enc->bits_per_coded_sample) {
av_log(enc, AV_LOG_WARNING, "requested bits_per_coded_sample (%d) and actually stored (%d) differ\n", enc->bits_per_coded_sample, bps); av_log(enc, AV_LOG_WARNING,
"requested bits_per_coded_sample (%d) "
"and actually stored (%d) differ\n",
enc->bits_per_coded_sample, bps);
} }
if (enc->codec_id == AV_CODEC_ID_MP2 || enc->codec_id == AV_CODEC_ID_MP3) { if (enc->codec_id == AV_CODEC_ID_MP2 ||
/* this is wrong, but it seems many demuxers do not work if this is set enc->codec_id == AV_CODEC_ID_MP3) {
correctly */ /* This is wrong, but it seems many demuxers do not work if this
* is set correctly. */
blkalign = frame_size; blkalign = frame_size;
//blkalign = 144 * enc->bit_rate/enc->sample_rate; // blkalign = 144 * enc->bit_rate/enc->sample_rate;
} else if (enc->codec_id == AV_CODEC_ID_AC3) { } else if (enc->codec_id == AV_CODEC_ID_AC3) {
blkalign = 3840; //maximum bytes per frame blkalign = 3840; /* maximum bytes per frame */
} else if (enc->codec_id == AV_CODEC_ID_AAC) { } else if (enc->codec_id == AV_CODEC_ID_AAC) {
blkalign = 768 * enc->channels; //maximum bytes per frame blkalign = 768 * enc->channels; /* maximum bytes per frame */
} else if (enc->codec_id == AV_CODEC_ID_G723_1) { } else if (enc->codec_id == AV_CODEC_ID_G723_1) {
blkalign = 24; blkalign = 24;
} else if (enc->block_align != 0) { /* specified by the codec */ } else if (enc->block_align != 0) { /* specified by the codec */
...@@ -526,33 +558,48 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) ...@@ -526,33 +558,48 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
bytestream_put_le16(&riff_extradata, 1393); /* nCodecDelay */ bytestream_put_le16(&riff_extradata, 1393); /* nCodecDelay */
} else if (enc->codec_id == AV_CODEC_ID_MP2) { } else if (enc->codec_id == AV_CODEC_ID_MP2) {
hdrsize += 22; hdrsize += 22;
bytestream_put_le16(&riff_extradata, 2); /* fwHeadLayer */ /* fwHeadLayer */
bytestream_put_le32(&riff_extradata, enc->bit_rate); /* dwHeadBitrate */ bytestream_put_le16(&riff_extradata, 2);
bytestream_put_le16(&riff_extradata, enc->channels == 2 ? 1 : 8); /* fwHeadMode */ /* dwHeadBitrate */
bytestream_put_le16(&riff_extradata, 0); /* fwHeadModeExt */ bytestream_put_le32(&riff_extradata, enc->bit_rate);
bytestream_put_le16(&riff_extradata, 1); /* wHeadEmphasis */ /* fwHeadMode */
bytestream_put_le16(&riff_extradata, 16); /* fwHeadFlags */ bytestream_put_le16(&riff_extradata, enc->channels == 2 ? 1 : 8);
bytestream_put_le32(&riff_extradata, 0); /* dwPTSLow */ /* fwHeadModeExt */
bytestream_put_le32(&riff_extradata, 0); /* dwPTSHigh */ bytestream_put_le16(&riff_extradata, 0);
/* wHeadEmphasis */
bytestream_put_le16(&riff_extradata, 1);
/* fwHeadFlags */
bytestream_put_le16(&riff_extradata, 16);
/* dwPTSLow */
bytestream_put_le32(&riff_extradata, 0);
/* dwPTSHigh */
bytestream_put_le32(&riff_extradata, 0);
} else if (enc->codec_id == AV_CODEC_ID_G723_1) { } else if (enc->codec_id == AV_CODEC_ID_G723_1) {
hdrsize += 20; hdrsize += 20;
bytestream_put_le32(&riff_extradata, 0x9ace0002); /* extradata needed for msacm g723.1 codec */ bytestream_put_le32(&riff_extradata, 0x9ace0002); /* extradata needed for msacm g723.1 codec */
bytestream_put_le32(&riff_extradata, 0xaea2f732); bytestream_put_le32(&riff_extradata, 0xaea2f732);
bytestream_put_le16(&riff_extradata, 0xacde); bytestream_put_le16(&riff_extradata, 0xacde);
} else if (enc->codec_id == AV_CODEC_ID_GSM_MS || enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { } else if (enc->codec_id == AV_CODEC_ID_GSM_MS ||
enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) {
hdrsize += 2; hdrsize += 2;
bytestream_put_le16(&riff_extradata, frame_size); /* wSamplesPerBlock */ /* wSamplesPerBlock */
} else if(enc->extradata_size){ bytestream_put_le16(&riff_extradata, frame_size);
riff_extradata_start= enc->extradata; } else if (enc->extradata_size) {
riff_extradata= enc->extradata + enc->extradata_size; riff_extradata_start = enc->extradata;
riff_extradata = enc->extradata + enc->extradata_size;
hdrsize += enc->extradata_size; hdrsize += enc->extradata_size;
} }
if(waveformatextensible) { /* write WAVEFORMATEXTENSIBLE extensions */ /* write WAVEFORMATEXTENSIBLE extensions */
if (waveformatextensible) {
hdrsize += 22; hdrsize += 22;
avio_wl16(pb, riff_extradata - riff_extradata_start + 22); /* 22 is WAVEFORMATEXTENSIBLE size */ /* 22 is WAVEFORMATEXTENSIBLE size */
avio_wl16(pb, bps); /* ValidBitsPerSample || SamplesPerBlock || Reserved */ avio_wl16(pb, riff_extradata - riff_extradata_start + 22);
avio_wl32(pb, enc->channel_layout); /* dwChannelMask */ /* ValidBitsPerSample || SamplesPerBlock || Reserved */
avio_wl32(pb, enc->codec_tag); /* GUID + next 3 */ avio_wl16(pb, bps);
/* dwChannelMask */
avio_wl32(pb, enc->channel_layout);
/* GUID + next 3 */
avio_wl32(pb, enc->codec_tag);
avio_wl32(pb, 0x00100000); avio_wl32(pb, 0x00100000);
avio_wl32(pb, 0xAA000080); avio_wl32(pb, 0xAA000080);
avio_wl32(pb, 0x719B3800); avio_wl32(pb, 0x719B3800);
...@@ -560,7 +607,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) ...@@ -560,7 +607,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */ avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */
} }
avio_write(pb, riff_extradata_start, riff_extradata - riff_extradata_start); avio_write(pb, riff_extradata_start, riff_extradata - riff_extradata_start);
if(hdrsize&1){ if (hdrsize & 1) {
hdrsize++; hdrsize++;
avio_w8(pb, 0); avio_w8(pb, 0);
} }
...@@ -569,15 +616,18 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) ...@@ -569,15 +616,18 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
} }
/* BITMAPINFOHEADER header */ /* BITMAPINFOHEADER header */
void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf) void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
const AVCodecTag *tags, int for_asf)
{ {
avio_wl32(pb, 40 + enc->extradata_size); /* size */ /* size */
avio_wl32(pb, 40 + enc->extradata_size);
avio_wl32(pb, enc->width); avio_wl32(pb, enc->width);
//We always store RGB TopDown //We always store RGB TopDown
avio_wl32(pb, enc->codec_tag ? enc->height : -enc->height); avio_wl32(pb, enc->codec_tag ? enc->height : -enc->height);
avio_wl16(pb, 1); /* planes */ /* planes */
avio_wl16(pb, 1);
avio_wl16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24); /* depth */ /* depth */
avio_wl16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24);
/* compression type */ /* compression type */
avio_wl32(pb, enc->codec_tag); avio_wl32(pb, enc->codec_tag);
avio_wl32(pb, (enc->width * enc->height * (enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24)+7) / 8); avio_wl32(pb, (enc->width * enc->height * (enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24)+7) / 8);
...@@ -592,32 +642,34 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *t ...@@ -592,32 +642,34 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *t
avio_w8(pb, 0); avio_w8(pb, 0);
} }
void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale) void ff_parse_specific_params(AVCodecContext *stream, int *au_rate,
int *au_ssize, int *au_scale)
{ {
int gcd; int gcd;
int audio_frame_size; int audio_frame_size;
/* We use the known constant frame size for the codec if known, otherwise /* We use the known constant frame size for the codec if known, otherwise
fallback to using AVCodecContext.frame_size, which is not as reliable * fall back on using AVCodecContext.frame_size, which is not as reliable
for indicating packet duration */ * for indicating packet duration. */
audio_frame_size = av_get_audio_frame_duration(stream, 0); audio_frame_size = av_get_audio_frame_duration(stream, 0);
if (!audio_frame_size) if (!audio_frame_size)
audio_frame_size = stream->frame_size; audio_frame_size = stream->frame_size;
*au_ssize= stream->block_align; *au_ssize = stream->block_align;
if (audio_frame_size && stream->sample_rate) { if (audio_frame_size && stream->sample_rate) {
*au_scale = audio_frame_size; *au_scale = audio_frame_size;
*au_rate= stream->sample_rate; *au_rate = stream->sample_rate;
}else if(stream->codec_type == AVMEDIA_TYPE_VIDEO || } else if (stream->codec_type == AVMEDIA_TYPE_VIDEO ||
stream->codec_type == AVMEDIA_TYPE_DATA || stream->codec_type == AVMEDIA_TYPE_DATA ||
stream->codec_type == AVMEDIA_TYPE_SUBTITLE){ stream->codec_type == AVMEDIA_TYPE_SUBTITLE) {
*au_scale= stream->time_base.num; *au_scale = stream->time_base.num;
*au_rate = stream->time_base.den; *au_rate = stream->time_base.den;
}else{ } else {
*au_scale= stream->block_align ? stream->block_align*8 : 8; *au_scale = stream->block_align ? stream->block_align * 8 : 8;
*au_rate = stream->bit_rate ? stream->bit_rate : 8*stream->sample_rate; *au_rate = stream->bit_rate ? stream->bit_rate :
8 * stream->sample_rate;
} }
gcd= av_gcd(*au_scale, *au_rate); gcd = av_gcd(*au_scale, *au_rate);
*au_scale /= gcd; *au_scale /= gcd;
*au_rate /= gcd; *au_rate /= gcd;
} }
...@@ -639,17 +691,16 @@ static const char riff_tags[][5] = { ...@@ -639,17 +691,16 @@ static const char riff_tags[][5] = {
"IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI",
"IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD", "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD",
"IPRT", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH", "IPRT", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH",
{0} { 0 }
}; };
static int riff_has_valid_tags(AVFormatContext *s) static int riff_has_valid_tags(AVFormatContext *s)
{ {
int i; int i;
for (i = 0; *riff_tags[i]; i++) { for (i = 0; *riff_tags[i]; i++)
if (av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE)) if (av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE))
return 1; return 1;
}
return 0; return 0;
} }
...@@ -669,13 +720,13 @@ void ff_riff_write_info(AVFormatContext *s) ...@@ -669,13 +720,13 @@ void ff_riff_write_info(AVFormatContext *s)
list_pos = ff_start_tag(pb, "LIST"); list_pos = ff_start_tag(pb, "LIST");
ffio_wfourcc(pb, "INFO"); ffio_wfourcc(pb, "INFO");
for (i = 0; *riff_tags[i]; i++) { for (i = 0; *riff_tags[i]; i++)
if ((t = av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE))) if ((t = av_dict_get(s->metadata, riff_tags[i],
NULL, AV_DICT_MATCH_CASE)))
ff_riff_write_info_tag(s->pb, t->key, t->value); ff_riff_write_info_tag(s->pb, t->key, t->value);
}
ff_end_tag(pb, list_pos); ff_end_tag(pb, list_pos);
} }
#endif //CONFIG_MUXERS #endif /* CONFIG_MUXERS */
#if CONFIG_DEMUXERS #if CONFIG_DEMUXERS
/* We could be given one of the three possible structures here: /* We could be given one of the three possible structures here:
...@@ -697,7 +748,7 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) ...@@ -697,7 +748,7 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
codec->block_align = avio_rl16(pb); codec->block_align = avio_rl16(pb);
if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */ if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
codec->bits_per_coded_sample = 8; codec->bits_per_coded_sample = 8;
}else } else
codec->bits_per_coded_sample = avio_rl16(pb); codec->bits_per_coded_sample = avio_rl16(pb);
if (id == 0xFFFE) { if (id == 0xFFFE) {
codec->codec_tag = 0; codec->codec_tag = 0;
...@@ -730,7 +781,8 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) ...@@ -730,7 +781,8 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
codec->extradata_size = cbSize; codec->extradata_size = cbSize;
if (cbSize > 0) { if (cbSize > 0) {
av_free(codec->extradata); av_free(codec->extradata);
codec->extradata = av_mallocz(codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); codec->extradata = av_mallocz(codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!codec->extradata) if (!codec->extradata)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avio_read(pb, codec->extradata, codec->extradata_size); avio_read(pb, codec->extradata, codec->extradata_size);
...@@ -742,7 +794,8 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) ...@@ -742,7 +794,8 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
avio_skip(pb, size); avio_skip(pb, size);
} }
if (codec->codec_id == AV_CODEC_ID_AAC_LATM) { if (codec->codec_id == AV_CODEC_ID_AAC_LATM) {
/* channels and sample_rate values are those prior to applying SBR and/or PS */ /* Channels and sample_rate values are those prior to applying SBR
* and/or PS. */
codec->channels = 0; codec->channels = 0;
codec->sample_rate = 0; codec->sample_rate = 0;
} }
...@@ -753,7 +806,6 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) ...@@ -753,7 +806,6 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
return 0; return 0;
} }
enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps) enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps)
{ {
enum AVCodecID id; enum AVCodecID id;
...@@ -779,7 +831,7 @@ int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize) ...@@ -779,7 +831,7 @@ int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize)
st->codec->width = avio_rl32(pb); st->codec->width = avio_rl32(pb);
st->codec->height = (int32_t)avio_rl32(pb); st->codec->height = (int32_t)avio_rl32(pb);
avio_rl16(pb); /* planes */ avio_rl16(pb); /* planes */
st->codec->bits_per_coded_sample= avio_rl16(pb); /* depth */ st->codec->bits_per_coded_sample = avio_rl16(pb); /* depth */
tag1 = avio_rl32(pb); tag1 = avio_rl32(pb);
avio_rl32(pb); /* ImageSize */ avio_rl32(pb); /* ImageSize */
avio_rl32(pb); /* XPelsPerMeter */ avio_rl32(pb); /* XPelsPerMeter */
...@@ -814,10 +866,11 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) ...@@ -814,10 +866,11 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
start = avio_tell(pb); start = avio_tell(pb);
end = start + size; end = start + size;
while ((cur = avio_tell(pb)) >= 0 && cur <= end - 8 /* = tag + size */) { while ((cur = avio_tell(pb)) >= 0 &&
cur <= end - 8 /* = tag + size */) {
uint32_t chunk_code; uint32_t chunk_code;
int64_t chunk_size; int64_t chunk_size;
char key[5] = {0}; char key[5] = { 0 };
char *value; char *value;
chunk_code = avio_rl32(pb); chunk_code = avio_rl32(pb);
...@@ -829,7 +882,9 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) ...@@ -829,7 +882,9 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
} }
break; break;
} }
if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) { if (chunk_size > end ||
end - chunk_size < cur ||
chunk_size == UINT_MAX) {
avio_seek(pb, -9, SEEK_CUR); avio_seek(pb, -9, SEEK_CUR);
chunk_code = avio_rl32(pb); chunk_code = avio_rl32(pb);
chunk_size = avio_rl32(pb); chunk_size = avio_rl32(pb);
...@@ -849,14 +904,16 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) ...@@ -849,14 +904,16 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
value = av_mallocz(chunk_size + 1); value = av_mallocz(chunk_size + 1);
if (!value) { if (!value) {
av_log(s, AV_LOG_ERROR, "out of memory, unable to read INFO tag\n"); av_log(s, AV_LOG_ERROR,
"out of memory, unable to read INFO tag\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
AV_WL32(key, chunk_code); AV_WL32(key, chunk_code);
if (avio_read(pb, value, chunk_size) != chunk_size) { if (avio_read(pb, value, chunk_size) != chunk_size) {
av_log(s, AV_LOG_WARNING, "premature end of file while reading INFO tag\n"); av_log(s, AV_LOG_WARNING,
"premature end of file while reading INFO tag\n");
} }
av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL); av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
...@@ -864,4 +921,4 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) ...@@ -864,4 +921,4 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
return 0; return 0;
} }
#endif // CONFIG_DEMUXERS #endif /* CONFIG_DEMUXERS */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment