diff --git a/codecs.h b/codecs.h index c9eb5fb..f51649b 100644 --- a/codecs.h +++ b/codecs.h @@ -32,13 +32,13 @@ typedef struct const mpeg2_level_t mpeg2_levels[] = { - { MPEG2_LEVEL_LOW, MPEG2_PROFILE_MAIN, 4000000, 475136 }, - { MPEG2_LEVEL_MAIN, MPEG2_PROFILE_SIMPLE, 15000000, 1835008 }, - { MPEG2_LEVEL_MAIN, MPEG2_PROFILE_MAIN, 15000000, 1835008 }, - { MPEG2_LEVEL_MAIN, MPEG2_PROFILE_422, 50000000, 9437184 }, - { MPEG2_LEVEL_HIGH_1440,MPEG2_PROFILE_MAIN, 60000000, 7340732 }, - { MPEG2_LEVEL_HIGH, MPEG2_PROFILE_MAIN, 80000000, 9781248 }, - { MPEG2_LEVEL_HIGHP, MPEG2_PROFILE_MAIN, 80000000, 9781248 }, + { LIBMPEGTS_MPEG2_LEVEL_LOW, LIBMPEGTS_MPEG2_PROFILE_MAIN, 4000000, 475136 }, + { LIBMPEGTS_MPEG2_LEVEL_MAIN, LIBMPEGTS_MPEG2_PROFILE_SIMPLE, 15000000, 1835008 }, + { LIBMPEGTS_MPEG2_LEVEL_MAIN, LIBMPEGTS_MPEG2_PROFILE_MAIN, 15000000, 1835008 }, + { LIBMPEGTS_MPEG2_LEVEL_MAIN, LIBMPEGTS_MPEG2_PROFILE_422, 50000000, 9437184 }, + { LIBMPEGTS_MPEG2_LEVEL_HIGH_1440,LIBMPEGTS_MPEG2_PROFILE_MAIN, 60000000, 7340732 }, + { LIBMPEGTS_MPEG2_LEVEL_HIGH, LIBMPEGTS_MPEG2_PROFILE_MAIN, 80000000, 9781248 }, + { LIBMPEGTS_MPEG2_LEVEL_HIGHP, LIBMPEGTS_MPEG2_PROFILE_MAIN, 80000000, 9781248 }, { 0 } }; diff --git a/libmpegts.c b/libmpegts.c index f69e477..3dacce4 100644 --- a/libmpegts.c +++ b/libmpegts.c @@ -1066,12 +1066,12 @@ int ts_setup_mpegvideo_stream( ts_writer_t *w, int pid, int level, int profile, if( stream->stream_format == LIBMPEGTS_VIDEO_MPEG2 ) { - if( level < MPEG2_LEVEL_LOW || level > MPEG2_LEVEL_HIGHP ) + if( level < LIBMPEGTS_MPEG2_LEVEL_LOW || level > LIBMPEGTS_MPEG2_LEVEL_HIGHP ) { fprintf( stderr, "Invalid MPEG-2 Level\n" ); return -1; } - if( profile < MPEG2_PROFILE_SIMPLE || profile > MPEG2_PROFILE_422 ) + if( profile < LIBMPEGTS_MPEG2_PROFILE_SIMPLE || profile > LIBMPEGTS_MPEG2_PROFILE_422 ) { fprintf( stderr, "Invalid MPEG-2 Profile\n" ); return -1; @@ -1132,7 +1132,7 @@ int ts_setup_mpegvideo_stream( ts_writer_t *w, int pid, int level, int profile, stream->rx = 1.2 * mpeg2_levels[level_idx].bitrate; stream->eb.buf_size = vbv_bufsize; - if( level == MPEG2_LEVEL_LOW || level == MPEG2_LEVEL_MAIN ) + if( level == LIBMPEGTS_MPEG2_LEVEL_LOW || level == LIBMPEGTS_MPEG2_LEVEL_MAIN ) { stream->mb.buf_size = bs_mux + bs_oh + mpeg2_levels[level_idx].vbv - vbv_bufsize; stream->rbx = mpeg2_levels[level_idx].bitrate; diff --git a/libmpegts.h b/libmpegts.h index 29f6d4e..a959de2 100644 --- a/libmpegts.h +++ b/libmpegts.h @@ -146,19 +146,19 @@ enum ts_type_t /* MPEG-2 Levels */ enum mpeg2_level_t { - MPEG2_LEVEL_LOW = 1, - MPEG2_LEVEL_MAIN, - MPEG2_LEVEL_HIGH_1440, - MPEG2_LEVEL_HIGH, - MPEG2_LEVEL_HIGHP, + LIBMPEGTS_MPEG2_LEVEL_LOW = 1, + LIBMPEGTS_MPEG2_LEVEL_MAIN, + LIBMPEGTS_MPEG2_LEVEL_HIGH_1440, + LIBMPEGTS_MPEG2_LEVEL_HIGH, + LIBMPEGTS_MPEG2_LEVEL_HIGHP, }; /* MPEG-2 Profiles */ enum mpeg2_profile_t { - MPEG2_PROFILE_SIMPLE, - MPEG2_PROFILE_MAIN, - MPEG2_PROFILE_422, + LIBMPEGTS_MPEG2_PROFILE_SIMPLE, + LIBMPEGTS_MPEG2_PROFILE_MAIN, + LIBMPEGTS_MPEG2_PROFILE_422, }; /* AVC Profiles */