Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/cafenc: Allow QDMC muxing.

Browse Source
pull/221/head
Carl Eugen Hoyos 9 years ago
parent 5f5a97dc3d
commit e274113292
3 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/caf.c
  2. 3
      libavformat/cafenc.c
  3. 2
      libavformat/version.h

2
libavformat/caf.c
Unescape View File

@ -55,7 +55,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
{ AV_CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, { AV_CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') },
{ AV_CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, { AV_CODEC_ID_QCELP, MKTAG('Q','c','l','p') },
{ AV_CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, { AV_CODEC_ID_QDM2, MKTAG('Q','D','M','2') },
{ AV_CODEC_ID_QDM2, MKTAG('Q','D','M','C') }, { AV_CODEC_ID_QDMC, MKTAG('Q','D','M','C') },
/* currently unsupported codecs */ /* currently unsupported codecs */
/*{ AC-3 over S/PDIF MKTAG('c','a','c','3') },*/ /*{ AC-3 over S/PDIF MKTAG('c','a','c','3') },*/
/*{ MPEG4CELP MKTAG('c','e','l','p') },*/ /*{ MPEG4CELP MKTAG('c','e','l','p') },*/

3
libavformat/cafenc.c
Unescape View File

@ -87,6 +87,7 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int bl
case AV_CODEC_ID_AC3: case AV_CODEC_ID_AC3:
return 1536; return 1536;
case AV_CODEC_ID_QDM2: case AV_CODEC_ID_QDM2:
case AV_CODEC_ID_QDMC:
return 2048 * channels; return 2048 * channels;
case AV_CODEC_ID_ALAC: case AV_CODEC_ID_ALAC:
return 4096; return 4096;
@ -169,7 +170,7 @@ static int caf_write_header(AVFormatContext *s)
avio_wb16(pb, 0x81FF); /* Mode set (all modes for AMR_NB) */ avio_wb16(pb, 0x81FF); /* Mode set (all modes for AMR_NB) */
avio_w8(pb, 0x00); /* Mode change period (no restriction) */ avio_w8(pb, 0x00); /* Mode change period (no restriction) */
avio_w8(pb, 0x01); /* Frames per sample */ avio_w8(pb, 0x01); /* Frames per sample */
} else if (par->codec_id == AV_CODEC_ID_QDM2) { } else if (par->codec_id == AV_CODEC_ID_QDM2 || par->codec_id == AV_CODEC_ID_QDMC) {
ffio_wfourcc(pb, "kuki"); ffio_wfourcc(pb, "kuki");
avio_wb64(pb, par->extradata_size); avio_wb64(pb, par->extradata_size);
avio_write(pb, par->extradata, par->extradata_size); avio_write(pb, par->extradata, par->extradata_size);

2
libavformat/version.h
Unescape View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you belive might regress here // Also please add any ticket numbers that you belive might regress here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 38 #define LIBAVFORMAT_VERSION_MINOR 38
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \

Write Preview
Loading…
Cancel
Save