shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1055 from ethanhugg/frameleakonerror

Destroy input frame on GMP encode on error conditions.

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

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

@@ -261,6 +261,7 @@

     assert (!frameTypes.empty());

     if (frameTypes.empty()) {

       GMPLOG (GL_ERROR, "No frame types provided");

+      inputImage->Destroy();

       return GMPVideoGenericErr;

     }

@@ -366,6 +367,7 @@

     GMPVideoErr err = host_->CreateFrame (kGMPEncodedVideoFrame, &ftmp);

     if (err != GMPVideoNoErr) {

       GMPLOG (GL_ERROR, "Error creating encoded frame");

+      frame->Destroy();

       return;

     }

@@ -389,6 +391,7 @@

     if (err != GMPVideoNoErr) {

       GMPLOG (GL_ERROR, "Error allocating frame data");

       f->Destroy();

+      frame->Destroy();

       return;

     }