Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added reframer_ts_vtt filter. #7

Open
wants to merge 1 commit into
base: integration
Choose a base branch
from
Open

added reframer_ts_vtt filter. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion include/gpac/internal/media_dev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,15 @@ void gf_media_format_ttxt_sdp(GP_RTPPacketizer *builder, char *payload_name, cha


#ifndef GPAC_DISABLE_VTT
#include <gpac/webvtt.h>

typedef enum {
WEBVTT_PARSER_STATE_WAITING_SIGNATURE, // 0
WEBVTT_PARSER_STATE_WAITING_HEADER, // 1
WEBVTT_PARSER_STATE_WAITING_CUE, // 2
WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP, // 3
WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD // 4
} GF_WebVTTParserState;

typedef struct _webvtt_parser GF_WebVTTParser;
typedef struct _webvtt_sample GF_WebVTTSample;
Expand All @@ -1141,18 +1150,19 @@ GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser);
void gf_webvtt_parser_del(GF_WebVTTParser *parser);
void gf_webvtt_parser_suspend(GF_WebVTTParser *vttparser);
void gf_webvtt_parser_restart(GF_WebVTTParser *parser);
void gf_webvtt_parser_force_state(GF_WebVTTParser *parser, GF_WebVTTParserState state);
GF_Err gf_webvtt_parser_parse_payload(GF_WebVTTParser *parser, u64 start, u64 end, const char *vtt_pre, const char *vtt_cueid, const char *vtt_settings);
GF_Err gf_webvtt_parser_flush(GF_WebVTTParser *parser);
GF_Err gf_webvtt_parser_parse_ext(GF_WebVTTParser *parser, FILE *ext_file, Bool in_eos);

#include <gpac/webvtt.h>
void gf_webvtt_parser_cue_callback(GF_WebVTTParser *parser, void (*on_cue_read)(void *, GF_WebVTTCue *), void *udta);
GF_Err gf_webvtt_merge_cues(GF_WebVTTParser *parser, u64 start, GF_List *cues);
GF_Err gf_webvtt_parser_finalize(GF_WebVTTParser *parser, u64 duration);

void gf_webvtt_sample_del(GF_WebVTTSample * samp);
u64 gf_webvtt_sample_get_start(GF_WebVTTSample * samp);
u64 gf_webvtt_sample_get_end(GF_WebVTTSample * samp);
GF_List* gf_webvtt_sample_get_cues(GF_WebVTTSample * samp);



Expand Down
2 changes: 2 additions & 0 deletions include/gpac/mpegts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ extern "C" {
enum {
GF_M2TS_META_ID3 = GF_4CC('I','D','3',' '),
GF_M2TS_META_KLVA = GF_4CC('K','L','V','A'),
GF_M2TS_META_WVTT = GF_4CC('W','V','T','T'),
};


Expand Down Expand Up @@ -298,6 +299,7 @@ typedef enum
GF_M2TS_DVB_SUBTITLE = 0x154,
GF_M2TS_METADATA_ID3_HLS = 0x155,
GF_M2TS_METADATA_ID3_KLVA = 0x156,
GF_M2TS_METADATA_WVTT = 0x157,

} GF_M2TSStreamType;

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ endif
SCENEGRAPH_CFLAGS=
MEDIATOOLS_CFLAGS=

LIBGPAC_FILTERS+=filters/bs_agg.o filters/bs_split.o filters/bsrw.o filters/compose.o filters/dasher.o filters/dec_ac52.o filters/dec_bifs.o filters/dec_faad.o filters/dec_img.o filters/dec_j2k.o filters/dec_laser.o filters/dec_mad.o filters/dec_mediacodec.o filters/dec_nvdec.o filters/dec_nvdec_sdk.o filters/dec_odf.o filters/dec_theora.o filters/dec_ttml.o filters/dec_ttxt.o filters/dec_uncv.o filters/dec_vorbis.o filters/dec_vtb.o filters/dec_webvtt.o filters/dec_xvid.o filters/decrypt_cenc_isma.o filters/dmx_avi.o filters/dmx_dash.o filters/dmx_ghi.o filters/dmx_gsf.o filters/dmx_m2ts.o filters/dmx_mpegps.o filters/dmx_nhml.o filters/dmx_nhnt.o filters/dmx_ogg.o filters/dmx_saf.o filters/dmx_vobsub.o filters/enc_jpg.o filters/enc_png.o filters/encrypt_cenc_isma.o filters/evg_rescale.o filters/filelist.o filters/hevcmerge.o filters/hevcsplit.o filters/in_dvb4linux.o filters/in_file.o filters/in_http.o filters/in_pipe.o filters/in_route.o filters/in_route_repair.o filters/in_rtp.o filters/in_rtp_rtsp.o filters/in_rtp_sdp.o filters/in_rtp_signaling.o filters/in_rtp_stream.o filters/in_sock.o filters/inspect.o filters/io_fcryp.o filters/isoffin_load.o filters/isoffin_read.o filters/isoffin_read_ch.o filters/jsfilter.o filters/load_bt_xmt.o filters/load_svg.o filters/load_text.o filters/mux_avi.o filters/mux_gsf.o filters/mux_isom.o filters/mux_ts.o filters/mux_ogg.o filters/out_audio.o filters/out_file.o filters/out_http.o filters/out_pipe.o filters/out_route.o filters/out_rtp.o filters/out_rtsp.o filters/out_sock.o filters/out_video.o filters/reframer.o filters/reframe_ac3.o filters/reframe_adts.o filters/reframe_latm.o filters/reframe_amr.o filters/reframe_av1.o filters/reframe_flac.o filters/reframe_h263.o filters/reframe_img.o filters/reframe_mhas.o filters/reframe_mp3.o filters/reframe_mpgvid.o filters/reframe_nalu.o filters/reframe_prores.o filters/reframe_qcp.o filters/reframe_rawvid.o filters/reframe_rawpcm.o filters/reframe_truehd.o filters/resample_audio.o filters/restamp.o filters/tileagg.o filters/tilesplit.o filters/tssplit.o filters/ttml_conv.o filters/unit_test_filter.o filters/rewind.o filters/rewrite_adts.o filters/rewrite_mhas.o filters/rewrite_mp4v.o filters/rewrite_nalu.o filters/rewrite_obu.o filters/vflip.o filters/vcrop.o filters/write_generic.o filters/write_nhml.o filters/write_nhnt.o filters/write_qcp.o filters/write_tx3g.o filters/write_vtt.o ../modules/dektec_out/dektec_video_decl.o filters/dec_opensvc.o filters/unframer.o filters/dec_scte35.o
LIBGPAC_FILTERS+=filters/bs_agg.o filters/bs_split.o filters/bsrw.o filters/compose.o filters/dasher.o filters/dec_ac52.o filters/dec_bifs.o filters/dec_faad.o filters/dec_img.o filters/dec_j2k.o filters/dec_laser.o filters/dec_mad.o filters/dec_mediacodec.o filters/dec_nvdec.o filters/dec_nvdec_sdk.o filters/dec_odf.o filters/dec_theora.o filters/dec_ttml.o filters/dec_ttxt.o filters/dec_uncv.o filters/dec_vorbis.o filters/dec_vtb.o filters/dec_webvtt.o filters/dec_xvid.o filters/decrypt_cenc_isma.o filters/dmx_avi.o filters/dmx_dash.o filters/dmx_ghi.o filters/dmx_gsf.o filters/dmx_m2ts.o filters/dmx_mpegps.o filters/dmx_nhml.o filters/dmx_nhnt.o filters/dmx_ogg.o filters/dmx_saf.o filters/dmx_vobsub.o filters/enc_jpg.o filters/enc_png.o filters/encrypt_cenc_isma.o filters/evg_rescale.o filters/filelist.o filters/hevcmerge.o filters/hevcsplit.o filters/in_dvb4linux.o filters/in_file.o filters/in_http.o filters/in_pipe.o filters/in_route.o filters/in_route_repair.o filters/in_rtp.o filters/in_rtp_rtsp.o filters/in_rtp_sdp.o filters/in_rtp_signaling.o filters/in_rtp_stream.o filters/in_sock.o filters/inspect.o filters/io_fcryp.o filters/isoffin_load.o filters/isoffin_read.o filters/isoffin_read_ch.o filters/jsfilter.o filters/load_bt_xmt.o filters/load_svg.o filters/load_text.o filters/mux_avi.o filters/mux_gsf.o filters/mux_isom.o filters/mux_ts.o filters/mux_ogg.o filters/out_audio.o filters/out_file.o filters/out_http.o filters/out_pipe.o filters/out_route.o filters/out_rtp.o filters/out_rtsp.o filters/out_sock.o filters/out_video.o filters/reframer.o filters/reframe_ac3.o filters/reframe_adts.o filters/reframe_latm.o filters/reframe_amr.o filters/reframe_av1.o filters/reframe_flac.o filters/reframe_h263.o filters/reframe_img.o filters/reframe_mhas.o filters/reframe_mp3.o filters/reframe_mpgvid.o filters/reframe_nalu.o filters/reframe_prores.o filters/reframe_qcp.o filters/reframe_rawvid.o filters/reframe_rawpcm.o filters/reframe_truehd.o filters/resample_audio.o filters/restamp.o filters/tileagg.o filters/tilesplit.o filters/tssplit.o filters/ttml_conv.o filters/unit_test_filter.o filters/rewind.o filters/rewrite_adts.o filters/rewrite_mhas.o filters/rewrite_mp4v.o filters/rewrite_nalu.o filters/rewrite_obu.o filters/vflip.o filters/vcrop.o filters/write_generic.o filters/write_nhml.o filters/write_nhnt.o filters/write_qcp.o filters/write_tx3g.o filters/reframe_ts_wvtt.o filters/passthrough.o filters/write_vtt.o ../modules/dektec_out/dektec_video_decl.o filters/dec_opensvc.o filters/unframer.o filters/dec_scte35.o
LIBGPAC_FILTERS_FFMPEG=filters/ff_common.o filters/ff_avf.o filters/ff_dec.o filters/ff_dmx.o filters/ff_enc.o filters/ff_rescale.o filters/ff_mx.o filters/ff_bsf.o
LIBGPAC_FILTERS_LIBCAPTION=filters/dec_cc.o
LIBGPAC_FILTERS_MPEGHDEC=filters/dec_mpeghdec.o
Expand Down
6 changes: 5 additions & 1 deletion src/filter_core/filter_register.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ REG_DEC(writegen)
REG_DEC(ufnalu)
REG_DEC(writeqcp)
REG_DEC(ufvtt)
REG_DEC(rftsvtt)
REG_DEC(passthrough)
REG_DEC(nhntw)
REG_DEC(nhmlw)
REG_DEC(vobsubdmx)
Expand Down Expand Up @@ -205,7 +207,7 @@ typedef struct

#define REG_IT(__n) { #__n , __n##_register }

BuiltinReg BuiltinFilters [] = {
BuiltinReg BuiltinFilters[] = {
REG_IT(inspect),
REG_IT(probe),
REG_IT(compositor),
Expand Down Expand Up @@ -270,6 +272,8 @@ BuiltinReg BuiltinFilters [] = {
REG_IT(ufnalu),
REG_IT(writeqcp),
REG_IT(ufvtt),
REG_IT(rftsvtt),
REG_IT(passthrough),
REG_IT(nhntw),
REG_IT(nhmlw),
REG_IT(vobsubdmx),
Expand Down
39 changes: 35 additions & 4 deletions src/filters/dmx_m2ts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,23 +421,33 @@ static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD
//fallthrough
case GF_M2TS_SCTE35_SPLICE_INFO_SECTIONS:
return; //ignore actively: these streams will be attached verbatim as properties to audio and/or video packets
case GF_M2TS_METADATA_WVTT:
stype = GF_STREAM_TEXT;
codecid = GF_CODECID_SIMPLE_TEXT;
stream->flags |= GF_M2TS_ES_FULL_AU;
break;
default:
GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TSDmx] Stream type 0x%02X not supported - ignoring pid\n", stream->stream_type));
return;
}
}

opid = NULL;
GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: searching for output PID for stream %d\n", stream->pid));
for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
opid = gf_filter_get_opid(ctx->filter, i);
const GF_PropertyValue *p = gf_filter_pid_get_property(opid, GF_PROP_PID_ID);
if (p && (p->value.uint == stream->pid))
if (p && (p->value.uint == stream->pid)) {
GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: output PID found\n"));
break;
}
opid = NULL;
}

if (!opid)
if (!opid) {
GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: creating output PID for stream %d\n", stream->pid));
opid = gf_filter_pid_new(ctx->filter);
}

stream->user = opid;
stream->flags |= GF_M2TS_ES_ALREADY_DECLARED;
Expand All @@ -460,6 +470,8 @@ static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD
gf_filter_pid_set_property(opid, GF_PROP_PID_ID, &PROP_UINT(stream->pid) );
gf_filter_pid_set_property(opid, GF_PROP_PID_ESID, stream->mpeg4_es_id ? &PROP_UINT(stream->mpeg4_es_id) : NULL);

GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: output PID \"%s\" created for TS stream %d\n", szName, stream->pid));

if (m4sys_stream) {
if (stream->slcfg) gf_free(stream->slcfg);

Expand All @@ -479,6 +491,7 @@ static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD
if (esd->decoderConfig && (esd->decoderConfig->streamType==GF_STREAM_OD))
stream->flags |= GF_M2TS_ES_IS_MPEG4_OD;
} else {
// TODO: Adarve this is the path for WVTT
gf_filter_pid_set_property(opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(stype) );
gf_filter_pid_set_property(opid, GF_PROP_PID_CODECID, &PROP_UINT(codecid) );

Expand All @@ -496,7 +509,11 @@ static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD
gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000) );
gf_filter_pid_set_property(opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(stream->program->pcr_pid) );

GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: checking (stream->flags&GF_M2TS_ES_IS_PES) && stream->gpac_meta_dsi\n"));
if ((stream->flags&GF_M2TS_ES_IS_PES) && stream->gpac_meta_dsi) {
// TODO: Adarve, WVTT does not take this path
GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: PASSED\n"));

char *cname;
GF_BitStream *bs = gf_bs_new(stream->gpac_meta_dsi, stream->gpac_meta_dsi_size, GF_BITSTREAM_READ);
u32 val = gf_bs_read_u32(bs); //codec ID (meta codec identifier)
Expand Down Expand Up @@ -592,6 +609,7 @@ static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD

m2tsdmx_update_sdt(ctx->ts, opid);

GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] m2tsdmx_declare_pid: setting default PES framing\n"));
gf_m2ts_set_pes_framing((GF_M2TS_PES *)stream, GF_M2TS_PES_FRAMING_DEFAULT);
}

Expand Down Expand Up @@ -745,7 +763,13 @@ static void m2tsdmx_send_packet(GF_M2TSDmxCtx *ctx, GF_M2TS_PES_PCK *pck)

/*pcr not initialized, don't send any data*/
// if (! pck->stream->program->first_dts) return;
if (!pck->stream->user) return;

// if (pck->stream->pid == 65) GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("m2tsdmx_send_packet: PID 65"));

if (!pck->stream->user) {
if (pck->stream->pid == 65) GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("m2tsdmx_send_packet: no opid"));
return;
}
opid = pck->stream->user;

u8 *ptr = pck->data;
Expand Down Expand Up @@ -795,6 +819,8 @@ static void m2tsdmx_send_packet(GF_M2TSDmxCtx *ctx, GF_M2TS_PES_PCK *pck)
}


// if (pck->stream->pid == 65) GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("m2tsdmx_send_packet: creating packet %llu\n", len));

dst_pck = gf_filter_pck_new_alloc(opid, len, &data);
if (!dst_pck) return;
memcpy(data, ptr, len);
Expand Down Expand Up @@ -1337,8 +1363,13 @@ static GF_Err m2tsdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool i
}
return GF_OK;
}
if (! gf_filter_pid_check_caps(pid))

GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDMx] m2tsdmx_configure_pid: checking caps for pid \"%s\"\n", gf_filter_pid_get_name(pid)));

if (! gf_filter_pid_check_caps(pid)) {
GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDMx] caps not supported \"%s\"\n", gf_filter_pid_get_name(pid)));
return GF_NOT_SUPPORTED;
}

//by default for all URLs, send packets as soon as the program is configured
ctx->mux_tune_state = DMX_TUNE_DONE;
Expand Down
Loading