Request 5758 (accepted)

gpac.changes Changed

gpac.spec Changed

gpac-2.2.0.tar.gz/Changelog -> gpac-2.2.1.tar.gz/Changelog Changed

gpac-2.2.0.tar.gz/README.md -> gpac-2.2.1.tar.gz/README.md Changed

gpac-2.2.0.tar.gz/applications/gpac/ios-Info.plist -> gpac-2.2.1.tar.gz/applications/gpac/ios-Info.plist Changed

gpac-2.2.0.tar.gz/debian/changelog -> gpac-2.2.1.tar.gz/debian/changelog Changed

gpac-2.2.0.tar.gz/debian/control -> gpac-2.2.1.tar.gz/debian/control Changed

gpac-2.2.0.tar.gz/gpac.spec -> gpac-2.2.1.tar.gz/gpac.spec Changed

gpac-2.2.0.tar.gz/include/gpac/version.h -> gpac-2.2.1.tar.gz/include/gpac/version.h Changed

gpac-2.2.0.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist -> gpac-2.2.1.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist Changed

gpac-2.2.0.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-2.2.1.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi Changed

gpac-2.2.0.tar.gz/src/bifs/unquantize.c -> gpac-2.2.1.tar.gz/src/bifs/unquantize.c Changed

gpac-2.2.0.tar.gz/src/filter_core/filter_pid.c -> gpac-2.2.1.tar.gz/src/filter_core/filter_pid.c Changed

@@ -62,13 +62,17 @@
 	gf_list_del(pidinst->pck_reassembly);
 	if (pidinst->props) {
 		assert(pidinst->props->reference_count);
-		if (safe_int_dec(&pidinst->props->reference_count) == 0) {
-			//see \ref gf_filter_pid_merge_properties_internal for mutex
-			gf_mx_p(pidinst->pid->filter->tasks_mx);
-			gf_list_del_item(pidinst->pid->properties, pidinst->props);
-			gf_mx_v(pidinst->pid->filter->tasks_mx);
-			gf_props_del(pidinst->props);
+		gf_mx_p(pidinst->pid->filter->tasks_mx);
+		//not in parent pid, may happen when reattaching a pid inst to a different pid
+		//in this case do NOT delete the props
+		if (gf_list_find(pidinst->pid->properties, pidinst->props)>=0) {
+			if (safe_int_dec(&pidinst->props->reference_count) == 0) {
+				//see \ref gf_filter_pid_merge_properties_internal for mutex
+				gf_list_del_item(pidinst->pid->properties, pidinst->props);
+				gf_props_del(pidinst->props);
+			}
 		}
+		gf_mx_v(pidinst->pid->filter->tasks_mx);
 	}
 	gf_free(pidinst);
 }
@@ -1025,8 +1029,15 @@
 						if (!target->detached_pid_inst) {
 							target->detached_pid_inst = gf_list_new();
 						}
-						//detach props but don't delete them
+						//detach props
 						if (filter->swap_pidinst_dst->props) {
+							GF_FilterPidInst *swap_pidi = filter->swap_pidinst_dst;
+							if (safe_int_dec(&swap_pidi->props->reference_count)==0) {
+								gf_mx_p(swap_pidi->pid->filter->tasks_mx);
+								gf_list_del_item(swap_pidi->pid->properties, pidinst->props);
+								gf_mx_v(swap_pidi->pid->filter->tasks_mx);
+								gf_props_del(pidinst->props);
+							}
 							filter->swap_pidinst_dst->props = NULL;
 						}
 						filter->swap_pidinst_dst->pid = NULL;
@@ -1275,7 +1286,7 @@
 	//first connection of this PID to this filter
 	if (!pidinst) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to detach PID %s not present in filter %s inputs\n",  pid->name, filter->name));
-		assert(!new_chain_input->swap_pidinst_dst);
+		//when swaping encoder, we may have swap_pidinst_dst not NULL so only check swap_pidinst_src
 		assert(!new_chain_input->swap_pidinst_src);
 		new_chain_input->swap_needs_init = GF_FALSE;
 		return;
@@ -5880,7 +5891,7 @@
 		}
 		src_props = pidi->props;
 	}
-	//move to rela pid
+	//move to real pid
 	src_pid = src_pid->pid;
 	//this is a copy props on output pid
 	if (!src_props) {

gpac-2.2.0.tar.gz/src/filters/load_text.c -> gpac-2.2.1.tar.gz/src/filters/load_text.c Changed

@@ -305,18 +305,24 @@
 			if (!unicode_type && (szLinei & 0x80)) {
 				/*non UTF8 (likely some win-CP)*/
 				if ((szLinei+1 & 0xc0) != 0x80) {
+					if (j >= GF_ARRAY_LENGTH(szLineConv))
+						break;
 					szLineConvj = 0xc0 | ( (szLinei >> 6) & 0x3 );
 					j++;
 					szLinei &= 0xbf;
 				}
 				/*UTF8 2 bytes char*/
 				else if ( (szLinei & 0xe0) == 0xc0) {
+					if (j >= GF_ARRAY_LENGTH(szLineConv))
+						break;
 					szLineConvj = szLinei;
 					i++;
 					j++;
 				}
 				/*UTF8 3 bytes char*/
 				else if ( (szLinei & 0xf0) == 0xe0) {
+					if (j+1 >= GF_ARRAY_LENGTH(szLineConv))
+						break;
 					szLineConvj = szLinei;
 					i++;
 					j++;
@@ -326,6 +332,8 @@
 				}
 				/*UTF8 4 bytes char*/
 				else if ( (szLinei & 0xf8) == 0xf0) {
+					if (j+2 >= GF_ARRAY_LENGTH(szLineConv))
+						break;
 					szLineConvj = szLinei;
 					i++;
 					j++;
@@ -340,8 +348,18 @@
 					continue;
 				}
 			}
+
+			if (j >= GF_ARRAY_LENGTH(szLineConv))
+				break;
+
 			szLineConvj = szLinei;
 			j++;
+
+
+		}
+		if ( j >= GF_ARRAY_LENGTH(szLineConv) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("TXTIn Line too long to convert to utf8 (len: %d)\n", len));
+			j = GF_ARRAY_LENGTH(szLineConv) -1 ;
 		}
 		szLineConvj = 0;
 		strcpy(szLine, szLineConv);

gpac-2.2.0.tar.gz/src/filters/reframe_adts.c -> gpac-2.2.1.tar.gz/src/filters/reframe_adts.c Changed

gpac-2.2.0.tar.gz/src/filters/reframe_av1.c -> gpac-2.2.1.tar.gz/src/filters/reframe_av1.c Changed

gpac-2.2.0.tar.gz/src/filters/reframe_mhas.c -> gpac-2.2.1.tar.gz/src/filters/reframe_mhas.c Changed

gpac-2.2.0.tar.gz/src/filters/reframe_mp3.c -> gpac-2.2.1.tar.gz/src/filters/reframe_mp3.c Changed

gpac-2.2.0.tar.gz/src/filters/reframe_rawpcm.c -> gpac-2.2.1.tar.gz/src/filters/reframe_rawpcm.c Changed

@@ -250,6 +250,7 @@
 
 	if (ctx->probe_wave==1) {
 		Bool wav_ok = GF_TRUE;
+		Bool hdr_found = GF_FALSE;
 		GF_BitStream *bs;
 		if (ctx->probe_data) {
 			ctx->probe_data = gf_realloc(ctx->probe_data, ctx->probe_data_size+pck_size);
@@ -280,6 +281,7 @@
 				continue;
 			}
 			//parse fmt
+			hdr_found = GF_TRUE;
 			u16 atype = gf_bs_read_u16_le(bs);
 			ctx->ch = gf_bs_read_u16_le(bs);
 			ctx->sr = gf_bs_read_u32_le(bs);
@@ -312,11 +314,13 @@
 				memcpy(ctx->probe_data, data, pck_size);
 				ctx->probe_data_size = pck_size;
 			}
-			if (ctx->probe_data_size<=10000) {
-				gf_filter_pid_drop_packet(ctx->ipid);
-				return GF_OK;
+			if (!hdr_found) {
+				if (ctx->probe_data_size<=10000) {
+					gf_filter_pid_drop_packet(ctx->ipid);
+					return GF_OK;
+				}
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("PCMReframe Cannot find wave data chunk after %d bytes, aborting\n", ctx->probe_data_size));
 			}
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("PCMReframe Cannot find wave data chink afetr %d bytes, aborting\n", ctx->probe_data_size));
 			wav_ok = GF_FALSE;
 		}

gpac-2.2.0.tar.gz/src/isomedia/box_code_base.c -> gpac-2.2.1.tar.gz/src/isomedia/box_code_base.c Changed

gpac-2.2.0.tar.gz/src/isomedia/box_funcs.c -> gpac-2.2.1.tar.gz/src/isomedia/box_funcs.c Changed

@@ -104,7 +104,7 @@
 	GF_Box *newBox;
 	Bool skip_logs = (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_NO_LOGS ) ? GF_TRUE : GF_FALSE;
 	Bool is_special = GF_TRUE;
-	
+
 	if ((bs == NULL) || (outBox == NULL) ) return GF_BAD_PARAM;
 	*outBox = NULL;
 	if (gf_bs_available(bs) < 8) {
@@ -1528,7 +1528,7 @@
 	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YVYU, video_sample_entry, "stsd", "apple"),
 	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_RGBA, video_sample_entry, "stsd", "apple"),
 	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_ABGR, video_sample_entry, "stsd", "apple"),
-	
+
 	FBOX_DEFINE_S(GF_QT_BOX_TYPE_STPS, stss, "stbl", 0, "apple"),
 
 	//dolby boxes
@@ -1918,7 +1918,7 @@
 
 	s32 cur_pos = gf_list_find(s->child_boxes, child);
 
-	//happens when partially cloning boxes 
+	//happens when partially cloning boxes
 	if (cur_pos < 0) return;
 
 	if (cur_pos != (s32) *pos) {
@@ -1949,7 +1949,7 @@
 	if (!a) return GF_BAD_PARAM;
 	//box has been disabled, do not write
 	if (!a->size) return GF_OK;
-	
+
 	if (a->registry->disabled) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("iso file Box %s disabled registry, skip write\n", gf_4cc_to_str(a->type)));
 		return GF_OK;

gpac-2.2.0.tar.gz/src/isomedia/isom_read.c -> gpac-2.2.1.tar.gz/src/isomedia/isom_read.c Changed

gpac-2.2.0.tar.gz/src/laser/lsr_dec.c -> gpac-2.2.1.tar.gz/src/laser/lsr_dec.c Changed

gpac-2.2.0.tar.gz/src/media_tools/av_parsers.c -> gpac-2.2.1.tar.gz/src/media_tools/av_parsers.c Changed

@@ -5677,10 +5677,10 @@
 	if (si->slice_type > 9) return -1;
 
 	pps_id = gf_bs_read_ue_log(bs, "pps_id");
-	if ((pps_id<0) || (pps_id > 255)) return -1;
+	if ((pps_id<0) || (pps_id >= 255)) return -1;
 	si->pps = &avc->ppspps_id;
 	if (!si->pps->slice_group_count) return -2;
-	if (si->pps->sps_id>=255) return -1;
+	if (si->pps->sps_id>=32) return -1;
 	si->sps = &avc->spssi->pps->sps_id;
 	if (!si->sps->log2_max_frame_num) return -2;
 	avc->sps_active_idx = si->pps->sps_id;
@@ -5787,7 +5787,7 @@
 	if (si->slice_type > 9) return -1;
 
 	pps_id = gf_bs_read_ue_log(bs, "pps_id");
-	if ((pps_id<0) || (pps_id > 255))
+	if ((pps_id<0) || (pps_id >= 255))
 		return -1;
 	si->pps = &avc->ppspps_id;
 	si->pps->id = pps_id;
@@ -7199,7 +7199,7 @@
 				u32 num_long_term_pics = 0;
 
 				memset(DeltaPocMsbCycleLt, 0, sizeof(u8) * 32);
-				
+
 				if (sps->num_long_term_ref_pic_sps > 0) {
 					num_long_term_sps = gf_bs_read_ue_log(bs, "num_long_term_sps");
 				}
@@ -7339,7 +7339,7 @@
 		}
 	}
 
-	si->header_size_bits = (gf_bs_get_position(bs) - 1) * 8 + gf_bs_get_bit_position(bs); // av_parser.c modified on 16 jan. 2019 
+	si->header_size_bits = (gf_bs_get_position(bs) - 1) * 8 + gf_bs_get_bit_position(bs); // av_parser.c modified on 16 jan. 2019
 
 	if (gf_bs_read_int_log(bs, 1, "byte_align") == 0) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("Error parsing slice header: byte_align not found at end of header !\n"));
@@ -10206,7 +10206,7 @@
 	s32 sync_pos=-1;
 
 	if (!ptr || !size) return 0;
-	
+
 	for (i=0; i<size-3; i++) {
 		if ((ptri==0xC0) && (ptri+1== 0x01) && (ptri+2==0xA5)) {
 			sync_pos = i;
@@ -10602,7 +10602,7 @@
 		sps->width -= SubWidthC * (sps->cw_left + sps->cw_right);
 		sps->height -= SubHeightC * (sps->cw_top + sps->cw_bottom);
 	}
-	
+
 	sps->subpic_info_present = gf_bs_read_int_log(bs, 1, "subpic_info_present");
 	if (sps->subpic_info_present) {
 		sps->nb_subpics = 1 + gf_bs_read_ue_log(bs, "nb_subpics_minus1");
@@ -12038,7 +12038,7 @@
 			memcpy(&vvc->s_info, &n_state, sizeof(VVCSliceInfo));
 			return ret;
 		}
-		
+
 		ret = 0;
 		if (n_state.compute_poc_defer || n_state.picture_header_in_slice_header_flag) {
 			is_slice = GF_TRUE;

gpac-2.2.0.tar.gz/src/media_tools/mpegts.c -> gpac-2.2.1.tar.gz/src/media_tools/mpegts.c Changed

gpac-2.2.0.tar.gz/src/odf/descriptors.c -> gpac-2.2.1.tar.gz/src/odf/descriptors.c Changed

gpac-2.2.0.tar.gz/src/utils/bitstream.c -> gpac-2.2.1.tar.gz/src/utils/bitstream.c Changed

Overview

Request 5758 (accepted)

Request History