Bug 1090991 - Modify MediaData::Type so that it may serve as a general-purpose enum for distinguishing audio and video. r=cpearce

We don't seem to have something like this already, and this seemed better than
introducing yet another new enum.

dom/media/MediaData.cpp

@@ -83,7 +83,7 @@ IsInEmulator()
 #endif
 
 VideoData::VideoData(int64_t aOffset, int64_t aTime, int64_t aDuration, int64_t aTimecode)
-  : MediaData(VIDEO_FRAME, aOffset, aTime, aDuration),
+  : MediaData(VIDEO_DATA, aOffset, aTime, aDuration),
     mTimecode(aTimecode),
     mDuplicate(true),
     mKeyframe(false)
@@ -98,7 +98,7 @@ VideoData::VideoData(int64_t aOffset,
                      bool aKeyframe,
                      int64_t aTimecode,
                      IntSize aDisplay)
-  : MediaData(VIDEO_FRAME, aOffset, aTime, aDuration),
+  : MediaData(VIDEO_DATA, aOffset, aTime, aDuration),
     mDisplay(aDisplay),
     mTimecode(aTimecode),
     mDuplicate(false),

dom/media/MediaData.h

@@ -25,8 +25,8 @@ class MediaData {
 public:
 
   enum Type {
-    AUDIO_SAMPLES = 0,
-    VIDEO_FRAME = 1
+    AUDIO_DATA = 0,
+    VIDEO_DATA
   };
 
   MediaData(Type aType,
@@ -73,7 +73,7 @@ public:
             AudioDataValue* aData,
             uint32_t aChannels,
             uint32_t aRate)
-    : MediaData(AUDIO_SAMPLES, aOffset, aTime, aDuration)
+    : MediaData(AUDIO_DATA, aOffset, aTime, aDuration)
     , mFrames(aFrames)
     , mChannels(aChannels)
     , mRate(aRate)

dom/media/fmp4/MP4Reader.cpp

@@ -613,7 +613,7 @@ MP4Reader::Output(TrackType aTrack, MediaData* aSample)
 
   switch (aTrack) {
     case kAudio: {
-      MOZ_ASSERT(aSample->mType == MediaData::AUDIO_SAMPLES);
+      MOZ_ASSERT(aSample->mType == MediaData::AUDIO_DATA);
       AudioData* audioData = static_cast<AudioData*>(aSample);
       AudioQueue().Push(audioData);
       if (audioData->mChannels != mInfo.mAudio.mChannels ||
@@ -626,7 +626,7 @@ MP4Reader::Output(TrackType aTrack, MediaData* aSample)
       break;
     }
     case kVideo: {
-      MOZ_ASSERT(aSample->mType == MediaData::VIDEO_FRAME);
+      MOZ_ASSERT(aSample->mType == MediaData::VIDEO_DATA);
       VideoQueue().Push(static_cast<VideoData*>(aSample));
       break;
     }

dom/media/fmp4/android/AndroidDecoderModule.cpp

@@ -49,7 +49,7 @@ public:
   VideoDataDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
                    MediaFormat* aFormat, MediaDataDecoderCallback* aCallback,
                    layers::ImageContainer* aImageContainer)
-    : MediaCodecDataDecoder(MediaData::Type::VIDEO_FRAME, aConfig.mime_type, aFormat, aCallback)
+    : MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mime_type, aFormat, aCallback)
     , mImageContainer(aImageContainer)
     , mConfig(aConfig)
   {
@@ -109,7 +109,7 @@ protected:
 class AudioDataDecoder : public MediaCodecDataDecoder {
 public:
   AudioDataDecoder(const char* aMimeType, MediaFormat* aFormat, MediaDataDecoderCallback* aCallback)
-  : MediaCodecDataDecoder(MediaData::Type::AUDIO_SAMPLES, aMimeType, aFormat, aCallback)
+  : MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aMimeType, aFormat, aCallback)
   {
   }