Skip to content

Commit

Permalink
fixed #2576
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanlf committed Aug 31, 2023
1 parent 4bac19a commit 4607052
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
5 changes: 5 additions & 0 deletions src/filters/dasher.c
Expand Up @@ -1173,6 +1173,11 @@ static GF_Err dasher_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is
CHECK_PROP(GF_PROP_PID_CODECID, ds->codec_id, GF_NOT_SUPPORTED)
CHECK_PROP(GF_PROP_PID_TIMESCALE, ds->timescale, GF_NOT_SUPPORTED)

if (!ds->timescale) {
GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[Dasher] Input PID %s has no timescale, cannot dash\n", gf_filter_pid_get_name(pid) ));
return GF_NON_COMPLIANT_BITSTREAM;
}

if (ds->stream_type==GF_STREAM_VISUAL) {
CHECK_PROP(GF_PROP_PID_WIDTH, ds->width, GF_EOS)
CHECK_PROP(GF_PROP_PID_HEIGHT, ds->height, GF_EOS)
Expand Down
1 change: 1 addition & 0 deletions src/filters/dmx_avi.c
Expand Up @@ -81,6 +81,7 @@ static void avidmx_setup(GF_Filter *filter, GF_AVIDmxCtx *ctx)
if (ctx->use_file_fps) {
Double fps = AVI_frame_rate(ctx->avi);
gf_media_get_video_timing(fps, &ctx->fps.num, &ctx->fps.den);
if (!ctx->fps.num) ctx->fps.num = ctx->fps.den = 1000;
}

dur.den = ctx->fps.num;
Expand Down
7 changes: 4 additions & 3 deletions src/filters/reframe_mhas.c
Expand Up @@ -638,10 +638,11 @@ GF_Err mhas_dmx_process(GF_Filter *filter)
numSpeakers = (s32) gf_mpegh_escaped_value(ctx->bs, 5, 8, 16) + 1;
//TODO ...
}
if (sr) {
mhas_dmx_check_pid(filter, ctx, pl, sr, frame_len, CICPspeakerLayoutIdx, numSpeakers, start + pay_start, (u32) mhas_size);

mhas_dmx_check_pid(filter, ctx, pl, sr, frame_len, CICPspeakerLayoutIdx, numSpeakers, start + pay_start, (u32) mhas_size);

has_cfg = GF_TRUE;
has_cfg = GF_TRUE;
}
}
//audio truncation
else if (mhas_type==17) {
Expand Down
5 changes: 2 additions & 3 deletions src/scene_manager/swf_parse.c
Expand Up @@ -1438,7 +1438,7 @@ static GF_Err swf_def_font(SWFReader *read, u32 revision)
ft->glyphs = gf_list_new();
ft->fontID = swf_get_16(read);
e = GF_OK;

gf_list_add(read->fonts, ft);

if (revision==0) {
start = swf_get_file_pos(read);
Expand Down Expand Up @@ -1538,8 +1538,6 @@ static GF_Err swf_def_font(SWFReader *read, u32 revision)
}
}
}

gf_list_add(read->fonts, ft);
return GF_OK;
}

Expand Down Expand Up @@ -2642,6 +2640,7 @@ GF_Err gf_swf_read_header(SWFReader *read)
read->frame_rate = swf_get_16(read)>>8;
read->frame_count = swf_get_16(read);
GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("SWF Import - Scene Size %gx%g - %d frames @ %d FPS\n", read->width, read->height, read->frame_count, read->frame_rate));
if (!read->frame_rate) read->frame_rate = 1;
return GF_OK;
}

Expand Down

0 comments on commit 4607052

Please sign in to comment.