Merge pull request #548 from valbok/android-crop

Render only cropped part of the frame for MediaCodec

Author: valbok

src/QtAVPlayer/qavhwdevice_mediacodec.cpp

@@ -15,6 +15,59 @@ extern "C" {
 #include <libavutil/pixdesc.h>
 #include <libavcodec/mediacodec.h>
 #include <libavutil/hwcontext_mediacodec.h>
+#include <stdatomic.h>
+
+struct FFAMediaCodec;
+struct FFAMediaFormat;
+// libavcodec/mediacodecdec_common.h
+typedef struct MediaCodecDecContext {
+
+    AVCodecContext *avctx;
+    atomic_int refcount;
+    atomic_int hw_buffer_count;
+
+    char *codec_name;
+
+    FFAMediaCodec *codec;
+    FFAMediaFormat *format;
+
+    void *surface;
+
+    int started;
+    int draining;
+    int flushing;
+    int eos;
+
+    int width;
+    int height;
+    int stride;
+    int slice_height;
+    int color_format;
+    int crop_top;
+    int crop_bottom;
+    int crop_left;
+    int crop_right;
+    int display_width;
+    int display_height;
+
+    uint64_t output_buffer_count;
+    ssize_t current_input_buffer;
+
+    bool delay_flush;
+    atomic_int serial;
+
+    bool use_ndk_codec;
+} MediaCodecDecContext;
+
+typedef struct MediaCodecBuffer {
+
+    MediaCodecDecContext *ctx;
+    ssize_t index;
+    int64_t pts;
+    atomic_int released;
+    int serial;
+
+} MediaCodecBuffer;
 }
 
 QT_BEGIN_NAMESPACE
@@ -96,7 +149,7 @@ class VideoBuffer_MediaCodec : public QAVVideoBuffer_GPU
             m_hw->androidSurfaceTexture->attachToGLContext(m_hw->texture);
         }
 
-        AVMediaCodecBuffer *buffer = reinterpret_cast<AVMediaCodecBuffer *>(frame().frame()->data[3]);
+        auto buffer = reinterpret_cast<AVMediaCodecBuffer *>(frame().frame()->data[3]);
         if (!buffer) {
             qWarning() << "Received a frame without AVMediaCodecBuffer.";
         } else if (av_mediacodec_release_buffer(buffer, 1) < 0) {
@@ -108,6 +161,17 @@ class VideoBuffer_MediaCodec : public QAVVideoBuffer_GPU
         return m_hw->texture;
     }
 
+    QSize size() const override
+    {
+        auto av_frame = frame().frame();
+        auto buffer = reinterpret_cast<AVMediaCodecBuffer *>(av_frame->data[3]);
+        if (!buffer) {
+            return frame().size();
+        }
+        auto ctx = reinterpret_cast<MediaCodecDecContext *>(buffer->ctx);
+        return {ctx->width, ctx->height};
+    }
+
     QAVHWDevice_MediaCodecPrivate *m_hw = nullptr;
 };
 

src/QtAVPlayer/qavvideobuffer_p.h

@@ -21,6 +21,7 @@
 
 #include <QtAVPlayer/qavvideoframe.h>
 #include <QVariant>
+#include <QSize>
 
 QT_BEGIN_NAMESPACE
 
@@ -36,6 +37,8 @@ class QAVVideoBuffer
     virtual QAVVideoFrame::MapData map() = 0;
     virtual QAVVideoFrame::HandleType handleType() const { return QAVVideoFrame::NoHandle; }
     virtual QVariant handle(QRhi */*rhi*/ = nullptr) const { return {}; }
+    // Returns the size of the frame from internal codec
+    virtual QSize size() const { return m_frame.size(); }
 protected:
     QAVVideoFrame m_frame;
 };

src/QtAVPlayer/qavvideoframe.cpp

@@ -505,13 +505,19 @@ QAVVideoFrame::operator QVideoFrame() const
     return QVideoFrame(new PlanarVideoBuffer(result, type), size(), format);
 #else
     QVideoFrameFormat videoFormat(size(), format);
-    
+
     QRect viewport(
         static_cast<int>(frame()->crop_left),
         static_cast<int>(frame()->crop_top),
         static_cast<int>(frame()->width - frame()->crop_left - frame()->crop_right),
         static_cast<int>(frame()->height - frame()->crop_top - frame()->crop_bottom)
     );
+    // Special case when the codec already cropped the frame and need to render only part of the frame
+    auto bufSize = reinterpret_cast<QAVVideoFramePrivate *>(result.d_ptr.get())->videoBuffer().size();
+    if (handleType() == GLTextureHandle && bufSize.height() > size().height() && size().height() == viewport.height()) {
+        auto diff = bufSize.height() - size().height();
+        viewport.setHeight(viewport.height() - diff - 1);
+    }
     videoFormat.setViewport(viewport);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
     videoFormat.setColorSpace(PlanarVideoBuffer::colorSpace(frame()));