modules/demux/adaptive/playlist/SegmentList.cpp

@@ -116,7 +116,7 @@ void SegmentList::updateWith(AbstractMultipleSegmentBaseType *updated_,
         const uint64_t oldest = updated->segments.front()->getSequenceNumber();
 
         /* filter out known segments from the update */
-        updated->pruneBySegmentNumber(prevSegment->getSequenceNumber());
+        updated->pruneBySegmentNumber(prevSegment->getSequenceNumber() + 1);
 
         if(updated->segments.empty())
             return;

modules/demux/adaptive/test/playlist/SegmentList.cpp

@@ -137,6 +137,37 @@ int SegmentList_test() try
     segmentList.reset();
     segmentList2.reset();
 
+    /* overlapping updates, relative timings */
+    segmentList = std::make_unique<SegmentList>(nullptr, true);
+    segmentList->addAttribute(new TimescaleAttr(timescale));
+    segmentList->addAttribute(new DurationAttr(100));
+    Expect(segmentList->inheritDuration());
+    for(int i=0; i<2; i++)
+    {
+        seg = std::make_unique<Segment>(nullptr);
+        seg->setSequenceNumber(123 + i);
+        seg->startTime.Set(START + 100 * i);
+        seg->duration.Set(100);
+        segmentList->addSegment(seg.release());
+    }
+    segmentList2 = std::make_unique<SegmentList>(nullptr, true);
+    for(int i=0; i<3; i++)
+    {
+        seg = std::make_unique<Segment>(nullptr);
+        seg->setSequenceNumber(123 + i);
+        seg->startTime.Set(START + 100 * i);
+        seg->duration.Set(100);
+        segmentList2->addSegment(seg.release());
+    }
+    segmentList->updateWith(segmentList2.get());
+    Expect(segmentList->getSegments().size() == 3);
+    Expect(segmentList->getSegments().at(0)->getSequenceNumber() == 123);
+    Expect(segmentList->getSegments().at(1)->getSequenceNumber() == 124);
+    Expect(segmentList->getSegments().at(2)->getSequenceNumber() == 125);
+
+    segmentList.reset();
+    segmentList2.reset();
+
     /* gap updates, relative timings */
     segmentList = std::make_unique<SegmentList>(nullptr, true);
     segmentList->addAttribute(new TimescaleAttr(timescale));

modules/demux/mpeg/h26x.c

@@ -205,7 +205,7 @@ static int ProbeH264( const uint8_t *p_peek, size_t i_peek, void *p_priv )
     }
     else if( i_nal_type == H264_NAL_AU_DELIMITER )
     {
-        if( i_ref_idc || p_ctx->b_pps || p_ctx->b_sps )
+        if( i_ref_idc )
             return -1;
     }
     else if ( i_nal_type == H264_NAL_SEI )

modules/gui/qt/medialibrary/mlbasemodel.cpp

@@ -257,14 +257,14 @@ MLItemId MLBaseModel::parentId() const
 void MLBaseModel::setParentId(MLItemId parentId)
 {
     m_parent = parentId;
-    invalidateCache();
+    resetCache();
     emit parentIdChanged();
 }
 
 void MLBaseModel::unsetParentId()
 {
     m_parent = MLItemId();
-    invalidateCache();
+    resetCache();
     emit parentIdChanged();
 }
 
@@ -294,7 +294,7 @@ void MLBaseModel::setSearchPattern( const QString& pattern )
         return;
 
     m_search_pattern = patternToApply;
-    invalidateCache();
+    resetCache();
 }
 
 Qt::SortOrder MLBaseModel::getSortOrder() const