Commit 62397ae5 authored by Noemi Erli's avatar Noemi Erli
Browse files

Backed out changeset f271e25759b2 (bug 1818567) for causing marionette and web-platform failures

parent 501b764d

dom/media/gtest/TestMediaDataEncoder.cpp

+8 −17
Original line number Diff line number Diff line
@@ -156,25 +156,16 @@ already_AddRefed<MediaDataEncoder> CreateVideoEncoder( 
                        "TestMediaDataEncoder"));



  RefPtr<MediaDataEncoder> e;

#ifdef MOZ_WIDGET_ANDROID

  const bool hardwareNotAllowed = false;

#else

  const bool hardwareNotAllowed = true;

#endif

  if (aSpecific) {

    e = f->CreateEncoder(

        CreateEncoderParams(videoInfo /* track info */, aUsage, taskQueue,

                            aPixelFormat, FRAME_RATE /* FPS */,

                            KEYFRAME_INTERVAL /* keyframe interval */,

                            BIT_RATE /* bitrate */, aSpecific.value()),

        hardwareNotAllowed);

    e = f->CreateEncoder(CreateEncoderParams(

        videoInfo /* track info */, aUsage, taskQueue, aPixelFormat,

        FRAME_RATE /* FPS */, KEYFRAME_INTERVAL /* keyframe interval */,

        BIT_RATE /* bitrate */, aSpecific.value()));

  } else {

    e = f->CreateEncoder(

        CreateEncoderParams(videoInfo /* track info */, aUsage, taskQueue,

                            aPixelFormat, FRAME_RATE /* FPS */,

                            KEYFRAME_INTERVAL /* keyframe interval */,

                            BIT_RATE /* bitrate */),

        hardwareNotAllowed);

    e = f->CreateEncoder(CreateEncoderParams(

        videoInfo /* track info */, aUsage, taskQueue, aPixelFormat,

        FRAME_RATE /* FPS */, KEYFRAME_INTERVAL /* keyframe interval */,

        BIT_RATE /* bitrate */));

  }



  return e.forget();

dom/media/platforms/PEMFactory.cpp

+2 −3
Original line number Diff line number Diff line
@@ -47,15 +47,14 @@ bool PEMFactory::SupportsMimeType(const nsACString& aMimeType) const { 
}



already_AddRefed<MediaDataEncoder> PEMFactory::CreateEncoder(

    const CreateEncoderParams& aParams, const bool aHardwareNotAllowed) {

    const CreateEncoderParams& aParams) {

  const TrackInfo& info = aParams.mConfig;

  RefPtr<PlatformEncoderModule> m = FindPEM(info);

  if (!m) {

    return nullptr;

  }



  return info.IsVideo() ? m->CreateVideoEncoder(aParams, aHardwareNotAllowed)

                        : nullptr;

  return info.IsVideo() ? m->CreateVideoEncoder(aParams) : nullptr;

}



already_AddRefed<PlatformEncoderModule> PEMFactory::FindPEM(

dom/media/platforms/PEMFactory.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class PEMFactory final { 
  // instance. It's expected that there will be multiple

  // PlatformEncoderModules alive at the same time.

  already_AddRefed<MediaDataEncoder> CreateEncoder(

      const CreateEncoderParams& aParams, const bool aHardwareNotAllowed);

      const CreateEncoderParams& aParams);



  bool SupportsMimeType(const nsACString& aMimeType) const;

dom/media/platforms/PlatformEncoderModule.h

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ class PlatformEncoderModule { 
  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PlatformEncoderModule)



  virtual already_AddRefed<MediaDataEncoder> CreateVideoEncoder(

      const CreateEncoderParams& aParams,

      const bool aHardwareNotAllowed) const {

      const CreateEncoderParams& aParams) const {

    return nullptr;

  };

dom/media/platforms/android/AndroidEncoderModule.cpp

+1 −4
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ bool AndroidEncoderModule::SupportsMimeType(const nsACString& aMimeType) const { 
}



already_AddRefed<MediaDataEncoder> AndroidEncoderModule::CreateVideoEncoder(

    const CreateEncoderParams& aParams, const bool aHardwareNotAllowed) const {

  // TODO: extend AndroidDataEncoder and Java codec to accept this option.

  MOZ_ASSERT(!aHardwareNotAllowed);



    const CreateEncoderParams& aParams) const {

  RefPtr<MediaDataEncoder> encoder;

  switch (CreateEncoderParams::CodecTypeForMime(aParams.mConfig.mMimeType)) {

    case MediaDataEncoder::CodecType::H264: