Permalink
Browse files

Added mpeg layer 1 and 2 to compressed codec handling.

Refs #492


git-svn-id: https://svn.perian.org/trunk@1432 621663c8-3916-0410-8f58-edc14a8543d5
  • Loading branch information...
gbooker
gbooker committed Apr 17, 2011
1 parent b0f24c2 commit 397e633592c609626f477e48503bb3ea1cad8a14
Showing with 14 additions and 0 deletions.
  1. +2 −0 CodecIDs.h
  2. +2 −0 CompressAudioCodec.cpp
  3. +8 −0 CompressCodecUtils.c
  4. +2 −0 codecList.m4
View
@@ -110,6 +110,8 @@ enum {
kCompressedAVC1 = 'CAVC',
kCompressedMP4V = 'CMP4',
kCompressedAC3 = 'CAC3',
kCompressedMP1 = 'CMP1',
kCompressedMP2 = 'CMP2',
kCompressedMP3 = 'CMP3',
kCompressedDTS = 'CDTS',
};
View
@@ -26,6 +26,8 @@
static const OSType kAllInputFormats[] =
{
kCompressedAC3,
kCompressedMP1,
kCompressedMP2,
kCompressedMP3,
kCompressedDTS,
0,
View
@@ -31,6 +31,10 @@ OSType compressStreamFourCC(OSType original)
return kCompressedMP4V;
case kAudioFormatMPEGLayer3:
return kCompressedMP3;
case kAudioFormatMPEGLayer2:
return kCompressedMP2;
case kAudioFormatMPEGLayer1:
return kCompressedMP1;
case kAudioFormatAC3:
return kCompressedAC3;
case kAudioFormatDTS:
@@ -49,6 +53,10 @@ OSType originalStreamFourCC(OSType compress)
return kH264CodecType;
case kCompressedMP4V:
return kMPEG4VisualCodecType;
case kCompressedMP1:
return kAudioFormatMPEGLayer1;
case kCompressedMP2:
return kAudioFormatMPEGLayer2;
case kCompressedMP3:
return kAudioFormatMPEGLayer3;
case kCompressedAC3:
View
@@ -70,5 +70,7 @@ Codec(kNellymoserCodecResourceID, CODEC_ID_NELLYMOSER, "Nellymoser ASAO", "An Au
EntryPoint(kFFissionCodecManufacturer, kFFissionCodecVersion, kCompressAC3CodecResourceID, "CompressAudioDecoderEntry", cmpThreadSafeOnMac, )
Codec(kCompressAC3CodecResourceID, CODEC_ID_NONE, "AC3", "Decompresses compressed video stream stored in H.264 format.", kCompressedAC3)
Codec(kCompressMP1CodecResourceID, CODEC_ID_NONE, "MPEG-1 Layer 1", "An AudioCodec that decodes MPEG-1 layer 1 audio into linear PCM", kCompressedMP1)
Codec(kCompressMP2CodecResourceID, CODEC_ID_NONE, "MPEG-1 Layer 2", "An AudioCodec that decodes MPEG-1 layer 2 audio into linear PCM", kCompressedMP2)
Codec(kCompressMP3CodecResourceID, CODEC_ID_NONE, "MP3", "Decompresses compressed video stream stored in MPEG-4 format.", kCompressedMP3)
Codec(kCompressDTSCodecResourceID, CODEC_ID_NONE, "DTS Coherent Acoustics", "An AudioCodec that decodes DCA Audio into linear PCM", kCompressedDTS)

0 comments on commit 397e633

Please sign in to comment.