Merge pull request #208 from shiguredo/feature/fix-amd-amf-autoscaling

AMF がオートスケール時に正しく動作しないのを修正する

Author: melpon

CHANGES.md

@@ -52,6 +52,8 @@
   - @melpon
 - [ADD] インストールするファイルに cmake/android.toolchain.cmake を追加
   - @melpon
+- [FIX] AMD AMF のデコーダーがオートスケーリング時に映像がおかしくなるのを修正
+  - @melpon
 
 ### misc
 

examples/sumomo/src/sumomo.cpp

@@ -233,8 +233,8 @@ class Sumomo : public std::enable_shared_from_this<Sumomo>,
   void OnPush(std::string text) override {}
   void OnMessage(std::string label, std::string data) override {}
 
-  void OnTrack(webrtc::scoped_refptr<webrtc::RtpTransceiverInterface> transceiver)
-      override {
+  void OnTrack(webrtc::scoped_refptr<webrtc::RtpTransceiverInterface>
+                   transceiver) override {
     if (renderer_ == nullptr) {
       return;
     }
@@ -591,6 +591,7 @@ int main(int argc, char* argv[]) {
   if (!audio_playout_device.empty()) {
     context_config.audio_playout_device = audio_playout_device;
   }
+  context_config.use_audio_device = false;
   context_config.video_codec_factory_config.preference = std::invoke([&]() {
     std::optional<sora::VideoCodecPreference> preference;
     auto add_codec_preference =

src/hwenc_amf/amf_video_decoder.cpp

@@ -155,6 +155,11 @@ int32_t AMFVideoDecoderImpl::Decode(const webrtc::EncodedImage& input_image,
       // queue is full; sleep, try to get ready surfaces  in polling thread and repeat submission
       amf_sleep(1);
       continue;
+    } else if (res == AMF_RESOLUTION_CHANGED || res == AMF_RESOLUTION_UPDATED) {
+      // デコードするサイズが変わったらデコーダを作り直す
+      ReleaseAMF();
+      InitAMF();
+      continue;
     } else {
       RETURN_IF_FAILED(res, L"Failed to SubmitInput()");
       break;
@@ -182,12 +187,17 @@ AMF_RESULT AMFVideoDecoderImpl::ProcessSurface(amf::AMFSurfacePtr surface) {
   RETURN_IF_FAILED(res, "Failed to Convert()");
 
   uint32_t pts = surface->GetPts();
-  RTC_LOG(LS_ERROR) << "pts=" << pts;
 
   auto py = surface->GetPlane(amf::AMF_PLANE_Y);
   auto pu = surface->GetPlane(amf::AMF_PLANE_U);
   auto pv = surface->GetPlane(amf::AMF_PLANE_V);
 
+  // RTC_LOG(LS_ERROR) << "AMFVideoDecoderImpl::ProcessSurface: "
+  //                   << "pts=" << pts << ", width=" << py->GetWidth()
+  //                   << ", height=" << py->GetHeight()
+  //                   << ", pitch_y=" << py->GetHPitch()
+  //                   << ", pitch_u=" << pu->GetHPitch()
+  //                   << ", pitch_v=" << pv->GetHPitch();
   webrtc::scoped_refptr<webrtc::I420Buffer> i420_buffer =
       buffer_pool_.CreateI420Buffer(py->GetWidth(), py->GetHeight());
   libyuv::I420Copy((const uint8_t*)py->GetNative(), py->GetHPitch(),