Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (6)
......@@ -223,8 +223,12 @@ codec_LTLIBRARIES += libsubsusf_plugin.la
libttml_plugin_la_SOURCES = codec/ttml/substtml.c \
demux/ttml.c \
codec/ttml/ttml.h codec/ttml/ttml.c \
codec/ttml/genttml.c \
codec/ttml/imageupdater.h \
codec/ttml/ttmlpes.h
if ENABLE_SOUT
libttml_plugin_la_SOURCES += codec/ttml/encttml.c
endif
codec_LTLIBRARIES += libttml_plugin.la
libwebvtt_plugin_la_SOURCES = codec/webvtt/subsvtt.c \
......
......@@ -342,10 +342,16 @@ vlc_modules += {
'sources' : files('subsusf.c')
}
# TTML decoder
# TTML
ttml_sources = files('ttml/substtml.c', 'ttml/ttml.c', 'ttml/genttml.c', '../demux/ttml.c')
if get_option('stream_outputs')
ttml_sources += files('ttml/encttml.c')
endif
vlc_modules += {
'name' : 'ttml',
'sources' : files('ttml/substtml.c', 'ttml/ttml.c', '../demux/ttml.c'),
'sources' : ttml_sources,
'include_directories' : include_directories('.')
}
......
/*****************************************************************************
* encttml.c : TTML encoder
*****************************************************************************
* Copyright (C) 2018-2024 VideoLabs, VLC authors and VideoLAN
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_subpicture.h>
#include "../codec/ttml/ttml.h"
#define HEX_COLOR_MAX 10
static void FillHexColor( uint32_t argb, bool withalpha, char text[HEX_COLOR_MAX] )
{
if( withalpha )
snprintf( text, HEX_COLOR_MAX, "#%08x", (argb << 8) | (argb >> 24) );
else
snprintf( text, HEX_COLOR_MAX, "#%06x", argb & 0x00FFFFFF );
}
static void AddTextNode( tt_node_t *p_parent, const char *psz_text )
{
const char *psz = psz_text;
const char *nl;
do
{
nl = strchr( psz, '\n' );
if( nl )
{
tt_subtextnode_New( p_parent, psz, nl - psz );
tt_node_New( p_parent, "br" );
psz += nl - psz + 1;
if( *psz == '\0' )
break;
}
else
{
tt_textnode_New( p_parent, psz );
}
} while ( nl );
}
static block_t *Encode( encoder_t *p_enc, subpicture_t *p_spu )
{
VLC_UNUSED( p_enc );
if( p_spu == NULL )
return NULL;
tt_node_t *p_root = tt_node_New( NULL, "tt" );
if( !p_root )
return NULL;
tt_node_AddAttribute( p_root, "xmlns", TT_NS );
tt_node_AddAttribute( p_root, "xmlns:tts", TT_NS_STYLING );
tt_node_t *p_body = tt_node_New( p_root, "body" );
if( !p_body )
{
tt_node_RecursiveDelete( p_root );
return NULL;
}
tt_node_t *p_div = tt_node_New( p_body, "div" );
if( !p_div )
{
tt_node_RecursiveDelete( p_root );
return NULL;
}
subpicture_region_t *p_region;
vlc_spu_regions_foreach(p_region, &p_spu->regions)
{
if( !subpicture_region_IsText( p_region ) ||
p_region->p_text == NULL ||
p_region->p_text->psz_text == NULL )
continue;
tt_node_t *p_par = tt_node_New( p_div, "p" );
if( !p_par )
continue;
if( p_spu->i_start != VLC_TICK_INVALID )
{
p_par->timings.begin = tt_time_Create( p_spu->i_start - VLC_TICK_0 );
if( p_spu->i_stop != VLC_TICK_INVALID && p_spu->i_stop > p_spu->i_start )
p_par->timings.end = tt_time_Create( p_spu->i_stop - VLC_TICK_0 );
tt_node_AddAttribute( p_par, "begin", "" );
}
for( const text_segment_t *p_segment = p_region->p_text;
p_segment; p_segment = p_segment->p_next )
{
if( p_segment->psz_text == NULL )
continue;
const text_style_t *style = p_segment->style;
if( style && style->i_features )
{
tt_node_t *p_span = tt_node_New( p_par, "span" );
if( !p_span )
continue;
if( style->f_font_relsize && p_spu->i_original_picture_height )
{
char fontsize[10];
unsigned relem = p_spu->i_original_picture_height * style->f_font_relsize / 16;
snprintf( fontsize, 10, "%u%%", relem );
tt_node_AddAttribute( p_span, "tts:fontSize", fontsize );
}
else if ( style->i_font_size )
{
char fontsize[10];
snprintf( fontsize, 10, "%upx", style->i_font_size );
tt_node_AddAttribute( p_span, "tts:fontSize", fontsize );
}
if( style->psz_fontname )
tt_node_AddAttribute( p_span, "tts:fontFamily", style->psz_fontname );
if( style->i_features & STYLE_HAS_FLAGS )
{
if( style->i_style_flags & STYLE_BOLD )
tt_node_AddAttribute( p_span, "tts:fontWeight", "bold" );
if( style->i_style_flags & STYLE_ITALIC )
tt_node_AddAttribute( p_span, "tts:fontStyle", "italic" );
if( style->i_style_flags & STYLE_UNDERLINE )
tt_node_AddAttribute( p_span, "tts:textDecoration", "underline" );
if( style->i_style_flags & STYLE_STRIKEOUT )
tt_node_AddAttribute( p_span, "tts:textDecoration", "lineThrough" );
if( style->i_style_flags & STYLE_OUTLINE )
{
char color[HEX_COLOR_MAX];
uint32_t argb = style->i_outline_color;
if( style->i_features & STYLE_HAS_OUTLINE_ALPHA )
argb |= style->i_outline_alpha << 24;
FillHexColor( argb, style->i_features & STYLE_HAS_OUTLINE_ALPHA, color );
tt_node_AddAttribute( p_span, "tts:textOutline", color );
}
}
if( style->i_features & STYLE_HAS_FONT_COLOR )
{
char color[HEX_COLOR_MAX];
uint32_t argb = style->i_font_color;
if( style->i_features & STYLE_HAS_FONT_ALPHA )
argb |= style->i_font_alpha << 24;
FillHexColor( argb, style->i_features & STYLE_HAS_FONT_ALPHA, color );
tt_node_AddAttribute( p_span, "tts:color", color );
}
if( style->i_features & STYLE_HAS_BACKGROUND_COLOR )
{
char color[HEX_COLOR_MAX];
uint32_t argb = style->i_background_color;
if( style->i_features & STYLE_HAS_BACKGROUND_ALPHA )
argb |= style->i_background_alpha << 24;
FillHexColor( argb, style->i_features & STYLE_HAS_BACKGROUND_ALPHA, color );
tt_node_AddAttribute( p_span, "tts:backgroundColor", color );
}
AddTextNode( p_span, p_segment->psz_text );
}
else
{
AddTextNode( p_par, p_segment->psz_text );
}
}
}
block_t* p_block = NULL;
struct vlc_memstream stream;
if( !vlc_memstream_open( &stream ) )
{
tt_time_t playbacktime = tt_time_Create( p_spu->i_start );
tt_node_ToText( &stream, (tt_basenode_t *)p_root, &playbacktime );
if( !vlc_memstream_close( &stream ) )
{
p_block = block_heap_Alloc( stream.ptr, stream.length );
if( p_block )
{
p_block->i_dts = p_block->i_pts = VLC_TICK_0 + p_spu->i_start;
if( p_spu->i_stop > p_spu->i_start )
p_block->i_length = p_spu->i_stop - p_spu->i_start;
}
}
}
tt_node_RecursiveDelete( p_root );
return p_block;
}
int tt_OpenEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
if( p_enc->fmt_out.i_codec != VLC_CODEC_TTML )
return VLC_EGENERIC;
p_enc->p_sys = NULL;
static const struct vlc_encoder_operations ops =
{ .encode_sub = Encode };
p_enc->ops = &ops;
p_enc->fmt_out.i_cat = SPU_ES;
return VLC_SUCCESS;
}
/*****************************************************************************
* genttml.c : TTML formatter
*****************************************************************************
* Copyright (C) 2015-2018 VLC authors and VideoLAN
* Copyright (C) 2017-2018 VideoLabs
*
* Authors: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
* Sushma Reddy <sushma.reddy@research.iiit.ac.in>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
//#define TTML_GEN_DEBUG
#include <vlc_common.h>
#include <vlc_strings.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include "../codec/ttml/ttml.h"
char *tt_genTiming( tt_time_t t )
{
if( !tt_time_Valid( &t ) )
t.base = 0;
unsigned f = t.base % CLOCK_FREQ;
t.base /= CLOCK_FREQ;
unsigned h = t.base / 3600;
unsigned m = t.base % 3600 / 60;
unsigned s = t.base % 60;
int i_ret;
char *psz;
if( f )
{
const char *lz = "000000";
const char *psz_lz = &lz[6];
/* add leading zeroes */
for( unsigned i=10*f; i<CLOCK_FREQ; i *= 10 )
psz_lz--;
/* strip trailing zeroes */
for( ; f > 0 && (f % 10) == 0; f /= 10 );
i_ret = asprintf( &psz, "%02u:%02u:%02u.%s%u",
h, m, s, psz_lz, f );
}
else if( t.frames )
{
i_ret = asprintf( &psz, "%02u:%02u:%02u:%s%u",
h, m, s, t.frames < 10 ? "0" : "", t.frames );
}
else
{
i_ret = asprintf( &psz, "%02u:%02u:%02u",
h, m, s );
}
return i_ret < 0 ? NULL : psz;
}
static void tt_MemstreamPutEntities( struct vlc_memstream *p_stream, const char *psz )
{
char *psz_entities = vlc_xml_encode( psz );
if( psz_entities )
{
vlc_memstream_puts( p_stream, psz_entities );
free( psz_entities );
}
}
void tt_node_AttributesToText( struct vlc_memstream *p_stream, const tt_node_t* p_node )
{
bool b_timed_node = false;
const vlc_dictionary_t* p_attr_dict = &p_node->attr_dict;
for( int i = 0; i < p_attr_dict->i_size; ++i )
{
for ( vlc_dictionary_entry_t* p_entry = p_attr_dict->p_entries[i];
p_entry != NULL; p_entry = p_entry->p_next )
{
const char *psz_value = NULL;
if( !strcmp(p_entry->psz_key, "begin") ||
!strcmp(p_entry->psz_key, "end") ||
!strcmp(p_entry->psz_key, "dur") )
{
b_timed_node = true;
/* will remove duration */
continue;
}
else if( !strcmp(p_entry->psz_key, "timeContainer") )
{
/* also remove sequential timings info (all abs now) */
continue;
}
else
{
psz_value = p_entry->p_value;
}
if( psz_value == NULL )
continue;
vlc_memstream_printf( p_stream, " %s=\"", p_entry->psz_key );
tt_MemstreamPutEntities( p_stream, psz_value );
vlc_memstream_putc( p_stream, '"' );
}
}
if( b_timed_node )
{
if( tt_time_Valid( &p_node->timings.begin ) )
{
char *psz = tt_genTiming( p_node->timings.begin );
vlc_memstream_printf( p_stream, " begin=\"%s\"", psz );
free( psz );
}
if( tt_time_Valid( &p_node->timings.end ) )
{
char *psz = tt_genTiming( p_node->timings.end );
vlc_memstream_printf( p_stream, " end=\"%s\"", psz );
free( psz );
}
}
}
void tt_node_ToText( struct vlc_memstream *p_stream, const tt_basenode_t *p_basenode,
const tt_time_t *playbacktime )
{
if( p_basenode->i_type == TT_NODE_TYPE_ELEMENT )
{
const tt_node_t *p_node = (const tt_node_t *) p_basenode;
if( tt_time_Valid( playbacktime ) &&
!tt_timings_Contains( &p_node->timings, playbacktime ) )
return;
vlc_memstream_putc( p_stream, '<' );
tt_MemstreamPutEntities( p_stream, p_node->psz_node_name );
tt_node_AttributesToText( p_stream, p_node );
if( tt_node_HasChild( p_node ) )
{
vlc_memstream_putc( p_stream, '>' );
#ifdef TTML_DEMUX_DEBUG
vlc_memstream_printf( p_stream, "<!-- starts %ld ends %ld -->",
tt_time_Convert( &p_node->timings.begin ),
tt_time_Convert( &p_node->timings.end ) );
#endif
for( const tt_basenode_t *p_child = p_node->p_child;
p_child; p_child = p_child->p_next )
{
tt_node_ToText( p_stream, p_child, playbacktime );
}
vlc_memstream_puts( p_stream, "</" );
tt_MemstreamPutEntities( p_stream, p_node->psz_node_name );
vlc_memstream_putc( p_stream, '>' );
}
else
vlc_memstream_puts( p_stream, "/>" );
}
else
{
const tt_textnode_t *p_textnode = (const tt_textnode_t *) p_basenode;
tt_MemstreamPutEntities( p_stream, p_textnode->psz_text );
}
}
......@@ -31,6 +31,7 @@
#include <vlc_text_style.h>
#include <vlc_charset.h>
#include <vlc_image.h>
#include <vlc_memstream.h>
#include <ctype.h>
#include <assert.h>
......@@ -728,7 +729,7 @@ static int ParseTTMLChunk( xml_reader_t *p_reader, tt_node_t **pp_rootnode )
*pp_rootnode != NULL )
return VLC_EGENERIC;
*pp_rootnode = tt_node_New( p_reader, NULL, psz_node_name );
*pp_rootnode = tt_node_NewRead( p_reader, NULL, psz_node_name );
if( !*pp_rootnode ||
tt_nodes_Read( p_reader, *pp_rootnode ) != VLC_SUCCESS )
return VLC_EGENERIC;
......
......@@ -55,7 +55,14 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_DEMUX )
set_callbacks( tt_OpenDemux, tt_CloseDemux )
add_shortcut( "ttml" )
#ifdef ENABLE_SOUT
add_submodule()
set_shortname( N_("TTML") )
set_description( N_("TTML encoder") )
set_capability( "spu encoder", 101 )
set_subcategory( SUBCAT_INPUT_SCODEC )
set_callbacks( tt_OpenEncoder, NULL )
#endif
vlc_module_end ()
......@@ -183,6 +190,20 @@ void tt_node_RecursiveDelete( tt_node_t *p_node )
tt_node_Delete( p_node );
}
void tt_node_RemoveAttribute( tt_node_t *p_node, const char *key )
{
vlc_dictionary_remove_value_for_key( &p_node->attr_dict, key,
tt_node_FreeDictValue, NULL );
}
int tt_node_AddAttribute( tt_node_t *p_node, const char *key, const char *value )
{
char *p_dup = strdup( value );
if( p_dup )
vlc_dictionary_insert( &p_node->attr_dict, key, p_dup );
return p_dup ? VLC_SUCCESS : VLC_EGENERIC;
}
static void tt_node_ParentAddChild( tt_node_t* p_parent, tt_basenode_t *p_child )
{
tt_basenode_t **pp_node = &p_parent->p_child;
......@@ -191,20 +212,35 @@ static void tt_node_ParentAddChild( tt_node_t* p_parent, tt_basenode_t *p_child
*pp_node = p_child;
}
static tt_textnode_t *tt_textnode_New( tt_node_t *p_parent, const char *psz_text )
static tt_textnode_t *tt_textnode_NewImpl( tt_node_t *p_parent, char *psz )
{
if( !psz )
return NULL;
tt_textnode_t *p_node = calloc( 1, sizeof( *p_node ) );
if( !p_node )
{
free( psz );
return NULL;
}
p_node->psz_text = psz;
p_node->i_type = TT_NODE_TYPE_TEXT;
p_node->p_parent = p_parent;
if( p_parent )
tt_node_ParentAddChild( p_parent, (tt_basenode_t *) p_node );
p_node->psz_text = strdup( psz_text );
return p_node;
}
tt_node_t * tt_node_New( xml_reader_t* reader, tt_node_t* p_parent, const char* psz_node_name )
tt_textnode_t *tt_textnode_New( tt_node_t *p_parent, const char *psz_text )
{
return tt_textnode_NewImpl( p_parent, strdup( psz_text ) );
}
tt_textnode_t *tt_subtextnode_New( tt_node_t *p_parent, const char *psz_text, size_t len )
{
return tt_textnode_NewImpl( p_parent, strndup( psz_text, len ) );
}
tt_node_t * tt_node_New( tt_node_t* p_parent, const char* psz_node_name )
{
tt_node_t *p_node = calloc( 1, sizeof( *p_node ) );
if( !p_node )
......@@ -225,6 +261,15 @@ tt_node_t * tt_node_New( xml_reader_t* reader, tt_node_t* p_parent, const char*
if( p_parent )
tt_node_ParentAddChild( p_parent, (tt_basenode_t *) p_node );
return p_node;
}
tt_node_t * tt_node_NewRead( xml_reader_t* reader, tt_node_t* p_parent, const char* psz_node_name )
{
tt_node_t *p_node = tt_node_New( p_parent, psz_node_name );
if( !p_node )
return NULL;
const char* psz_value = NULL;
for( const char* psz_key = xml_ReaderNextAttr( reader, &psz_value );
psz_key != NULL;
......@@ -328,7 +373,7 @@ int tt_nodes_Read( xml_reader_t *p_reader, tt_node_t *p_root_node )
case XML_READER_STARTELEM:
{
tt_node_t *p_newnode = tt_node_New( p_reader, p_node, psz_node_name );
tt_node_t *p_newnode = tt_node_NewRead( p_reader, p_node, psz_node_name );
if( !p_newnode )
return VLC_EGENERIC;
if( !b_empty )
......
......@@ -20,12 +20,15 @@
#include <vlc_tick.h>
#include <vlc_arrays.h>
#include <vlc_memstream.h>
int tt_OpenDemux( vlc_object_t* p_this );
void tt_CloseDemux( vlc_object_t* p_demux );
int tt_OpenDecoder ( vlc_object_t * );
int tt_OpenEncoder ( vlc_object_t * );
enum
{
TT_TIMINGS_UNSPEC = 0,
......@@ -99,10 +102,15 @@ typedef struct
char *psz_text;
} tt_textnode_t;
tt_node_t * tt_node_New( xml_reader_t* reader, tt_node_t* p_parent, const char* psz_node_name );
tt_textnode_t *tt_textnode_New( tt_node_t *p_parent, const char *psz_text );
tt_textnode_t *tt_subtextnode_New( tt_node_t *p_parent, const char *psz_text, size_t );
tt_node_t * tt_node_New( tt_node_t* p_parent, const char* psz_node_name );
tt_node_t * tt_node_NewRead( xml_reader_t* reader, tt_node_t* p_parent, const char* psz_node_name );
void tt_node_RecursiveDelete( tt_node_t *p_node );
int tt_node_NameCompare( const char* psz_tagname, const char* psz_pattern );
bool tt_node_HasChild( const tt_node_t *p_node );
int tt_node_AddAttribute( tt_node_t *p_node, const char *key, const char *value );
void tt_node_RemoveAttribute( tt_node_t *p_node, const char *key );
int tt_nodes_Read( xml_reader_t *p_reader, tt_node_t *p_root_node );
......@@ -168,3 +176,10 @@ static inline tt_time_t tt_time_Sub( tt_time_t t1, tt_time_t t2 )
t1.base -= t2.base;
return t1;
}
/* Encoding */
char *tt_genTiming( tt_time_t t );
void tt_node_AttributesToText( struct vlc_memstream *p_stream, const tt_node_t* p_node );
void tt_node_ToText( struct vlc_memstream *p_stream, const tt_basenode_t *p_basenode,
const tt_time_t *playbacktime );
......@@ -67,156 +67,6 @@ typedef struct
} times;
} demux_sys_t;
static char *tt_genTiming( tt_time_t t )
{
if( !tt_time_Valid( &t ) )
t.base = 0;
unsigned f = t.base % CLOCK_FREQ;
t.base /= CLOCK_FREQ;
unsigned h = t.base / 3600;
unsigned m = t.base % 3600 / 60;
unsigned s = t.base % 60;
int i_ret;
char *psz;
if( f )
{
const char *lz = "000000";
const char *psz_lz = &lz[6];
/* add leading zeroes */
for( unsigned i=10*f; i<CLOCK_FREQ; i *= 10 )
psz_lz--;
/* strip trailing zeroes */
for( ; f > 0 && (f % 10) == 0; f /= 10 );
i_ret = asprintf( &psz, "%02u:%02u:%02u.%s%u",
h, m, s, psz_lz, f );
}
else if( t.frames )
{
i_ret = asprintf( &psz, "%02u:%02u:%02u:%s%u",
h, m, s, t.frames < 10 ? "0" : "", t.frames );
}
else
{
i_ret = asprintf( &psz, "%02u:%02u:%02u",
h, m, s );
}
return i_ret < 0 ? NULL : psz;
}
static void tt_MemstreamPutEntities( struct vlc_memstream *p_stream, const char *psz )
{
char *psz_entities = vlc_xml_encode( psz );
if( psz_entities )
{
vlc_memstream_puts( p_stream, psz_entities );
free( psz_entities );
}
}
static void tt_node_AttributesToText( struct vlc_memstream *p_stream, const tt_node_t* p_node )
{
bool b_timed_node = false;
const vlc_dictionary_t* p_attr_dict = &p_node->attr_dict;
for( int i = 0; i < p_attr_dict->i_size; ++i )
{
for ( vlc_dictionary_entry_t* p_entry = p_attr_dict->p_entries[i];
p_entry != NULL; p_entry = p_entry->p_next )
{
const char *psz_value = NULL;
if( !strcmp(p_entry->psz_key, "begin") ||
!strcmp(p_entry->psz_key, "end") ||
!strcmp(p_entry->psz_key, "dur") )
{
b_timed_node = true;
/* will remove duration */
continue;
}
else if( !strcmp(p_entry->psz_key, "timeContainer") )
{
/* also remove sequential timings info (all abs now) */
continue;
}
else
{
psz_value = p_entry->p_value;
}
if( psz_value == NULL )
continue;
vlc_memstream_printf( p_stream, " %s=\"", p_entry->psz_key );
tt_MemstreamPutEntities( p_stream, psz_value );
vlc_memstream_putc( p_stream, '"' );
}
}
if( b_timed_node )
{
if( tt_time_Valid( &p_node->timings.begin ) )
{
char *psz = tt_genTiming( p_node->timings.begin );
vlc_memstream_printf( p_stream, " begin=\"%s\"", psz );
free( psz );
}
if( tt_time_Valid( &p_node->timings.end ) )
{
char *psz = tt_genTiming( p_node->timings.end );
vlc_memstream_printf( p_stream, " end=\"%s\"", psz );
free( psz );
}
}
}
static void tt_node_ToText( struct vlc_memstream *p_stream, const tt_basenode_t *p_basenode,
const tt_time_t *playbacktime )
{
if( p_basenode->i_type == TT_NODE_TYPE_ELEMENT )
{
const tt_node_t *p_node = (const tt_node_t *) p_basenode;
if( tt_time_Valid( playbacktime ) &&
!tt_timings_Contains( &p_node->timings, playbacktime ) )
return;
vlc_memstream_putc( p_stream, '<' );
tt_MemstreamPutEntities( p_stream, p_node->psz_node_name );
tt_node_AttributesToText( p_stream, p_node );
if( tt_node_HasChild( p_node ) )
{
vlc_memstream_putc( p_stream, '>' );
#ifdef TTML_DEMUX_DEBUG
vlc_memstream_printf( p_stream, "<!-- starts %ld ends %ld -->",
tt_time_Convert( &p_node->timings.begin ),
tt_time_Convert( &p_node->timings.end ) );
#endif
for( const tt_basenode_t *p_child = p_node->p_child;
p_child; p_child = p_child->p_next )
{
tt_node_ToText( p_stream, p_child, playbacktime );
}
vlc_memstream_puts( p_stream, "</" );
tt_MemstreamPutEntities( p_stream, p_node->psz_node_name );
vlc_memstream_putc( p_stream, '>' );
}
else
vlc_memstream_puts( p_stream, "/>" );
}
else
{
const tt_textnode_t *p_textnode = (const tt_textnode_t *) p_basenode;
tt_MemstreamPutEntities( p_stream, p_textnode->psz_text );
}
}
static int Control( demux_t* p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
......@@ -327,7 +177,7 @@ static int ReadTTML( demux_t* p_demux )
p_sys->p_rootnode != NULL )
return VLC_EGENERIC;
p_sys->p_rootnode = tt_node_New( p_sys->p_reader, NULL, psz_node_name );
p_sys->p_rootnode = tt_node_NewRead( p_sys->p_reader, NULL, psz_node_name );
if( b_empty )
break;
if( !p_sys->p_rootnode ||
......