Ticket #12643: Ticket_12643_Fix_Resolution_change_crash.patch

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -3281 +3281 @@
 
             if (changed)
             {
+                if (private_dec)
+                    private_dec->Reset();
+
                 m_parent->SetVideoParams(width, height, seqFPS, kScan_Detect);
 
                 current_width  = width;
                 current_height = height;
                 fps            = seqFPS;
 
-                if (private_dec)
-                    private_dec->Reset();
-
                 gopset = false;
                 prevgoppos = 0;
                 firstvpts = lastapts = lastvpts = lastccptsu = 0;
@@ -3388 +3388 @@
 
         if (fps_changed || res_changed)
         {
+            if (private_dec)
+                private_dec->Reset();
+
             m_parent->SetVideoParams(width, height, seqFPS, kScan_Detect);
 
             current_width  = width;

mythtv/libs/libmythtv/privatedecoder_omx.cpp

@@ -567 +567 @@
         m_lock.unlock();
 
         VideoFrame *frame = HDR2FRAME(hdr);
-        if (frame)
+        if (frame && FRAME2HDR(frame) == hdr)
         {
-            assert(FRAME2HDR(frame) == hdr);
             FRAMESETHDR(frame, 0);
 
             AVBufferRef *ref = FRAME2REF(frame);
@@ -665 +664 @@
 
         VideoFrame *frame = (VideoFrame*)picture->opaque;
         assert(frame);
-        assert(unsigned(frame->size) >= def.nBufferSize);
 
         OMX_BUFFERHEADERTYPE *hdr;
         e = OMX_UseBuffer(m_videc.Handle(), &hdr, m_videc.Base() + index, frame,
@@ -936 +934 @@
         picture->reordered_opaque = Ticks2Pts(stream, hdr->nTimeStamp);
 
         VideoFrame *frame = HDR2FRAME(hdr);
-        if (frame)
-        {
-            assert(FRAME2HDR(frame) == hdr);
-            assert(FRAME2REF(frame));
 
+        if (frame && FRAME2HDR(frame) == hdr)
+        {
             frame->bpp    = bitsperpixel(frametype);
             frame->codec  = frametype;
             frame->width  = vdef.nFrameWidth;