Skip to content

F
ffmpeg.wasm-core
Commit 475ae04a authored by Michael Chinen's avatar Michael Chinen Committed by Justin Ruggles
Browse files
Options

Add a FLAC parser. 

Seek test reference updated because FLAC seeking now works properly.
Fixes roundup issue 1150.

Patch by Michael Chinen [mchinen at gmail]

Originally committed as revision 25914 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ed4e1e58
Expand all Show whitespace changes
Inline Side-by-side
Showing with 698 additions and 24 deletions
Changelog
View file @ 475ae04a
...@@ -63,6 +63,7 @@ version <next>: ...@@ -63,6 +63,7 @@ version <next>:
- frei0r source added - frei0r source added
- hqdn3d filter added - hqdn3d filter added
- RTP depacketization of QCELP - RTP depacketization of QCELP
- FLAC parser added
version 0.6: version 0.6:
......
configure
View file @ 475ae04a
...@@ -1351,6 +1351,7 @@ asf_stream_muxer_select="asf_muxer" ...@@ -1351,6 +1351,7 @@ asf_stream_muxer_select="asf_muxer"
avisynth_demuxer_deps="avisynth" avisynth_demuxer_deps="avisynth"
dirac_demuxer_deps="dirac_parser" dirac_demuxer_deps="dirac_parser"
eac3_demuxer_select="ac3_parser" eac3_demuxer_select="ac3_parser"
flac_demuxer_deps="flac_parser"
ipod_muxer_select="mov_muxer" ipod_muxer_select="mov_muxer"
libnut_demuxer_deps="libnut" libnut_demuxer_deps="libnut"
libnut_muxer_deps="libnut" libnut_muxer_deps="libnut"
......
libavcodec/Makefile
View file @ 475ae04a
...@@ -570,6 +570,7 @@ OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o ...@@ -570,6 +570,7 @@ OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o
OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o
OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o
OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o
OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o
OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o
OBJS-$(CONFIG_H263_PARSER) += h263_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o
OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \ OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \
......
libavcodec/allcodecs.c
View file @ 475ae04a
...@@ -376,6 +376,7 @@ void avcodec_register_all(void) ...@@ -376,6 +376,7 @@ void avcodec_register_all(void)
REGISTER_PARSER (DNXHD, dnxhd); REGISTER_PARSER (DNXHD, dnxhd);
REGISTER_PARSER (DVBSUB, dvbsub); REGISTER_PARSER (DVBSUB, dvbsub);
REGISTER_PARSER (DVDSUB, dvdsub); REGISTER_PARSER (DVDSUB, dvdsub);
REGISTER_PARSER (FLAC, flac);
REGISTER_PARSER (H261, h261); REGISTER_PARSER (H261, h261);
REGISTER_PARSER (H263, h263); REGISTER_PARSER (H263, h263);
REGISTER_PARSER (H264, h264); REGISTER_PARSER (H264, h264);
......
libavcodec/avcodec.h
View file @ 475ae04a
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 98 #define LIBAVCODEC_VERSION_MINOR 99
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
libavcodec/flac_parser.c 0 → 100644
View file @ 475ae04a
This diff is collapsed.
tests/ref/seek/flac_flac
View file @ 475ae04a
ret: 0 st: 0 flags:1 dts: NOPTS pts: NOPTS pos: 8256 size: 1024 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614
ret:-1 st:-1 flags:0 ts:-1.000000 ret: 0 st:-1 flags:0 ts:-1.000000
ret:-1 st:-1 flags:1 ts: 1.894167 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614
ret:-1 st: 0 flags:0 ts: 0.788345 ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos: 86742 size: 2191
ret: 0 st: 0 flags:0 ts: 0.788345
ret: 0 st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos: 27366 size: 615
ret:-1 st: 0 flags:1 ts:-0.317506 ret:-1 st: 0 flags:1 ts:-0.317506
ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:0 ts: 2.576668
ret:-1 st:-1 flags:1 ts: 1.470835 ret: 0 st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos: 145606 size: 2384
ret:-1 st: 0 flags:0 ts: 0.365011 ret: 0 st:-1 flags:1 ts: 1.470835
ret: 0 st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos: 53388 size: 1851
ret: 0 st: 0 flags:0 ts: 0.365011
ret: 0 st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos: 16890 size: 614
ret:-1 st: 0 flags:1 ts:-0.740839 ret:-1 st: 0 flags:1 ts:-0.740839
ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:0 ts: 2.153336
ret:-1 st:-1 flags:1 ts: 1.047503 ret: 0 st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos: 110531 size: 2143
ret:-1 st: 0 flags:0 ts:-0.058322 ret: 0 st:-1 flags:1 ts: 1.047503
ret:-1 st: 0 flags:1 ts: 2.835828 ret: 0 st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos: 32880 size: 579
ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st: 0 flags:0 ts:-0.058322
ret:-1 st:-1 flags:1 ts: 0.624171 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614
ret:-1 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 ts: 2.835828
ret:-1 st: 0 flags:1 ts: 2.412494 ret: 0 st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos: 167112 size: 2391
ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:0 ts: 1.730004
ret:-1 st:-1 flags:1 ts: 0.200839 ret: 0 st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos: 75788 size: 2191
ret:-1 st: 0 flags:0 ts:-0.904989 ret: 0 st:-1 flags:1 ts: 0.624171
ret:-1 st: 0 flags:1 ts: 1.989184 ret: 0 st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos: 22446 size: 616
ret:-1 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:0 ts:-0.481655
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614
ret: 0 st: 0 flags:1 ts: 2.412494
ret: 0 st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos: 129793 size: 2138
ret: 0 st:-1 flags:0 ts: 1.306672
ret: 0 st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos: 44812 size: 1609
ret: 0 st:-1 flags:1 ts: 0.200839
ret: 0 st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos: 12572 size: 628
ret: 0 st: 0 flags:0 ts:-0.904989
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614
ret: 0 st: 0 flags:1 ts: 1.989184
ret: 0 st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos: 95508 size: 2169
ret: 0 st:-1 flags:0 ts: 0.883340
ret: 0 st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos: 29211 size: 620
ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st:-1 flags:1 ts:-0.222493
ret:-1 st: 0 flags:0 ts: 2.671678 ret: 0 st: 0 flags:0 ts: 2.671678
ret:-1 st: 0 flags:1 ts: 1.565850 ret: 0 st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos: 155154 size: 2394
ret:-1 st:-1 flags:0 ts: 0.460008 ret: 0 st: 0 flags:1 ts: 1.565850
ret: 0 st: 0 flags:1 dts: 1.541224 pts: 1.541224 pos: 59082 size: 1974
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos: 19353 size: 608
ret:-1 st:-1 flags:1 ts:-0.645825 ret:-1 st:-1 flags:1 ts:-0.645825
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment