Mercurial > mplayer.hg
view codec-cfg.h @ 24589:9118be6575da
demux_audio.c: Fix timestamp handling
The code calculated the pts values of audio packets by adding the length
of the current packet to the pts of the previous one. The length of the
previous packet should be added instead. This broke WAV timestamps near
the end of the stream where a short packet occurs.
Change the code to store the pts of the next packet instead of the last
one. This fixes the WAV timestamps and allows some simplifications.
MP3 timestamps are not affected as packets are always treated as
constant decoded length, and FLAC timestamps still have worse problems
(FLAC is treated as as if it was constant bitrate even though it isn't).
Also store the timestamps as double instead of float.
author | uau |
---|---|
date | Mon, 24 Sep 2007 21:49:56 +0000 |
parents | f8b5286f1df6 |
children | 293aeec83153 |
line wrap: on
line source
#ifndef CODEC_CFG_H #define CODEC_CFG_H #define CODEC_CFG_MIN 20070407 #define CODECS_MAX_FOURCC 32 #define CODECS_MAX_OUTFMT 16 #define CODECS_MAX_INFMT 16 // Global flags: #define CODECS_FLAG_SEEKABLE (1<<0) #define CODECS_FLAG_ALIGN16 (1<<1) #define CODECS_FLAG_SELECTED (1<<15) /* for internal use */ // Outfmt flags: #define CODECS_FLAG_FLIP (1<<0) #define CODECS_FLAG_NOFLIP (1<<1) #define CODECS_FLAG_YUVHACK (1<<2) #define CODECS_FLAG_QUERY (1<<3) #define CODECS_FLAG_STATIC (1<<4) #define CODECS_STATUS__MIN 0 #define CODECS_STATUS_NOT_WORKING -1 #define CODECS_STATUS_PROBLEMS 0 #define CODECS_STATUS_WORKING 1 #define CODECS_STATUS_UNTESTED 2 #define CODECS_STATUS__MAX 2 #if !defined(GUID_TYPE) && !defined(GUID_DEFINED) #define GUID_TYPE 1 #define GUID_DEFINED 1 typedef struct { unsigned long f1; unsigned short f2; unsigned short f3; unsigned char f4[8]; } GUID; #endif typedef struct codecs_st { unsigned int fourcc[CODECS_MAX_FOURCC]; unsigned int fourccmap[CODECS_MAX_FOURCC]; unsigned int outfmt[CODECS_MAX_OUTFMT]; unsigned char outflags[CODECS_MAX_OUTFMT]; unsigned int infmt[CODECS_MAX_INFMT]; unsigned char inflags[CODECS_MAX_INFMT]; char *name; char *info; char *comment; char *dll; char* drv; GUID guid; // short driver; short flags; short status; short cpuflags; } codecs_t; int parse_codec_cfg(const char *cfgfile); codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int force); codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int force); codecs_t* find_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int audioflag, int force); void select_codec(char* codecname,int audioflag); void list_codecs(int audioflag); void codecs_reset_selection(int audioflag); void codecs_uninit_free(void); #endif /* CODEC_CFG_H */