* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "dsputil.h"
-#include "get_bits.h"
-//#define DEBUG
-//#define DEBUG_PACKET_CONTENTS
+#include <inttypes.h>
+#include <string.h>
+
+#include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
+
+#include "avcodec.h"
+#include "internal.h"
/* Parser (mostly) copied from dvdsub.c */
{
DVBSubParseContext *pc = s->priv_data;
uint8_t *p, *p_end;
- int len, buf_pos = 0;
+ int i, len, buf_pos = 0;
- av_dlog(avctx, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", cpts=%"PRIx64":\n",
+ ff_dlog(avctx, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", cpts=%"PRIx64":\n",
s->pts, s->last_pts, s->cur_frame_pts[s->cur_frame_start_index]);
-#ifdef DEBUG_PACKET_CONTENTS
- int i;
-
for (i=0; i < buf_size; i++)
{
- av_log(avctx, AV_LOG_INFO, "%02x ", buf[i]);
+ ff_dlog(avctx, "%02x ", buf[i]);
if (i % 16 == 15)
- av_log(avctx, AV_LOG_INFO, "\n");
+ ff_dlog(avctx, "\n");
}
if (i % 16 != 0)
- av_log(avctx, AV_LOG_INFO, "\n");
-
-#endif
+ ff_dlog(avctx, "\n");
*poutbuf = NULL;
*poutbuf_size = 0;
{
if (pc->packet_index != pc->packet_start)
{
- av_dlog(avctx, "Discarding %d bytes\n",
+ ff_dlog(avctx, "Discarding %d bytes\n",
pc->packet_index - pc->packet_start);
}
pc->packet_index = 0;
if (buf_size < 2 || buf[0] != 0x20 || buf[1] != 0x00) {
- av_dlog(avctx, "Bad packet header\n");
+ ff_dlog(avctx, "Bad packet header\n");
return -1;
}
} else if (*p == 0xff) {
if (p + 1 < p_end)
{
- av_dlog(avctx, "Junk at end of packet\n");
+ ff_dlog(avctx, "Junk at end of packet\n");
}
pc->packet_index = p - pc->packet_buf;
pc->in_packet = 0;
}
AVCodecParser ff_dvbsub_parser = {
- { CODEC_ID_DVB_SUBTITLE },
- sizeof(DVBSubParseContext),
- dvbsub_parse_init,
- dvbsub_parse,
- dvbsub_parse_close,
+ .codec_ids = { AV_CODEC_ID_DVB_SUBTITLE },
+ .priv_data_size = sizeof(DVBSubParseContext),
+ .parser_init = dvbsub_parse_init,
+ .parser_parse = dvbsub_parse,
+ .parser_close = dvbsub_parse_close,
};