shithub: openh264

Info  •  Files  •  Log  •  Branches

Call InputExhausted when input has not produced a frame, call Error when
the decoder did not produce valid output, call DrainComplete in Drain
and FlushComplete in Flush.  Without these, the caller of the GMP may
end up waiting forever on a requested operation to complete.

--- a/module/gmp-openh264.cpp

+++ b/module/gmp-openh264.cpp

@@ -653,9 +653,15 @@

   }

   virtual void Reset() {

+    if (callback_) {

+      callback_->ResetComplete ();

+    }

   }

   virtual void Drain() {

+    if (callback_) {

+      callback_->DrainComplete ();

+    }

   }

   virtual void DecodingComplete() {

@@ -713,11 +719,14 @@

     // If we don't actually have data, just abort.

     if (!valid) {

+      GMPLOG (GL_ERROR, "No valid data decoded");

       Error (GMPDecodeErr);

       return;

     }

     if (decoded->iBufferStatus != 1) {

+      GMPLOG (GL_ERROR, "iBufferStatus=" << decoded->iBufferStatus);

+      callback_->InputDataExhausted();

       return;

     }