Commits · 28b7d7a36d0ee6458853af089b7ca193c03f1f10 · Linshizhi / ffmpeg.wasm-core

10 May, 2015 29 commits

Michael Niedermayer authored May 10, 2015

* commit 'b8d2630c':
  dashenc: Reduce the segment duration if cutting out parts with edit lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>

28b7d7a3

Merge commit '' · ae99f06e

Michael Niedermayer authored May 10, 2015

* commit 'ac1a1cb9':
  dashenc: replace attribute id with contentType for the AdaptationSet element

See: 32a4177aMerged-by: Michael Niedermayer <michaelni@gmx.at>

ae99f06e

dashenc: replace attribute id with contentType for the AdaptationSet element · 32a4177a

James Almer authored May 10, 2015

id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.

This addresses ticket #4545, fixing an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

32a4177a

fate: Use more than 5 frames for testing select and idet filters · 8d916ef5

Michael Niedermayer authored May 10, 2015

Testing these filters with just 5 frames could potentially be
insufficient
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8d916ef5

Merge commit '' · 5e19651c

Michael Niedermayer authored May 10, 2015

* commit '2fb02ecf':
  fate: Reduce the number of frames used to test video filters

Conflicts:
	tests/fate-run.sh
	tests/ref/fate/filter-crop
	tests/ref/fate/filter-crop_scale
	tests/ref/fate/filter-crop_scale_vflip
	tests/ref/fate/filter-crop_vflip
	tests/ref/fate/filter-null
	tests/ref/fate/filter-pixdesc-abgr
	tests/ref/fate/filter-pixdesc-argb
	tests/ref/fate/filter-pixdesc-bgr24
	tests/ref/fate/filter-pixdesc-bgr444be
	tests/ref/fate/filter-pixdesc-bgr444le
	tests/ref/fate/filter-pixdesc-bgr48be
	tests/ref/fate/filter-pixdesc-bgr48le
	tests/ref/fate/filter-pixdesc-bgr4_byte
	tests/ref/fate/filter-pixdesc-bgr555be
	tests/ref/fate/filter-pixdesc-bgr555le
	tests/ref/fate/filter-pixdesc-bgr565be
	tests/ref/fate/filter-pixdesc-bgr565le
	tests/ref/fate/filter-pixdesc-bgr8
	tests/ref/fate/filter-pixdesc-bgra
	tests/ref/fate/filter-pixdesc-gbrap
	tests/ref/fate/filter-pixdesc-gbrp
	tests/ref/fate/filter-pixdesc-gbrp10be
	tests/ref/fate/filter-pixdesc-gbrp10le
	tests/ref/fate/filter-pixdesc-gbrp9be
	tests/ref/fate/filter-pixdesc-gbrp9le
	tests/ref/fate/filter-pixdesc-gray
	tests/ref/fate/filter-pixdesc-gray16be
	tests/ref/fate/filter-pixdesc-gray16le
	tests/ref/fate/filter-pixdesc-monob
	tests/ref/fate/filter-pixdesc-monow
	tests/ref/fate/filter-pixdesc-nv12
	tests/ref/fate/filter-pixdesc-nv21
	tests/ref/fate/filter-pixdesc-rgb24
	tests/ref/fate/filter-pixdesc-rgb444be
	tests/ref/fate/filter-pixdesc-rgb444le
	tests/ref/fate/filter-pixdesc-rgb48be
	tests/ref/fate/filter-pixdesc-rgb48le
	tests/ref/fate/filter-pixdesc-rgb4_byte
	tests/ref/fate/filter-pixdesc-rgb555be
	tests/ref/fate/filter-pixdesc-rgb555le
	tests/ref/fate/filter-pixdesc-rgb565be
	tests/ref/fate/filter-pixdesc-rgb565le
	tests/ref/fate/filter-pixdesc-rgb8
	tests/ref/fate/filter-pixdesc-rgba
	tests/ref/fate/filter-pixdesc-uyvy422
	tests/ref/fate/filter-pixdesc-yuv410p
	tests/ref/fate/filter-pixdesc-yuv411p
	tests/ref/fate/filter-pixdesc-yuv420p
	tests/ref/fate/filter-pixdesc-yuv420p10be
	tests/ref/fate/filter-pixdesc-yuv420p10le
	tests/ref/fate/filter-pixdesc-yuv420p16be
	tests/ref/fate/filter-pixdesc-yuv420p16le
	tests/ref/fate/filter-pixdesc-yuv420p9be
	tests/ref/fate/filter-pixdesc-yuv420p9le
	tests/ref/fate/filter-pixdesc-yuv422p
	tests/ref/fate/filter-pixdesc-yuv422p10be
	tests/ref/fate/filter-pixdesc-yuv422p10le
	tests/ref/fate/filter-pixdesc-yuv422p16be
	tests/ref/fate/filter-pixdesc-yuv422p16le
	tests/ref/fate/filter-pixdesc-yuv422p9be
	tests/ref/fate/filter-pixdesc-yuv422p9le
	tests/ref/fate/filter-pixdesc-yuv440p
	tests/ref/fate/filter-pixdesc-yuv444p
	tests/ref/fate/filter-pixdesc-yuv444p10be
	tests/ref/fate/filter-pixdesc-yuv444p10le
	tests/ref/fate/filter-pixdesc-yuv444p16be
	tests/ref/fate/filter-pixdesc-yuv444p16le
	tests/ref/fate/filter-pixdesc-yuv444p9be
	tests/ref/fate/filter-pixdesc-yuv444p9le
	tests/ref/fate/filter-pixdesc-yuva420p
	tests/ref/fate/filter-pixdesc-yuva420p10be
	tests/ref/fate/filter-pixdesc-yuva420p10le
	tests/ref/fate/filter-pixdesc-yuva420p16be
	tests/ref/fate/filter-pixdesc-yuva420p16le
	tests/ref/fate/filter-pixdesc-yuva420p9be
	tests/ref/fate/filter-pixdesc-yuva420p9le
	tests/ref/fate/filter-pixdesc-yuva422p
	tests/ref/fate/filter-pixdesc-yuva422p10be
	tests/ref/fate/filter-pixdesc-yuva422p10le
	tests/ref/fate/filter-pixdesc-yuva422p16be
	tests/ref/fate/filter-pixdesc-yuva422p16le
	tests/ref/fate/filter-pixdesc-yuva422p9be
	tests/ref/fate/filter-pixdesc-yuva422p9le
	tests/ref/fate/filter-pixdesc-yuva444p
	tests/ref/fate/filter-pixdesc-yuva444p10be
	tests/ref/fate/filter-pixdesc-yuva444p10le
	tests/ref/fate/filter-pixdesc-yuva444p16be
	tests/ref/fate/filter-pixdesc-yuva444p16le
	tests/ref/fate/filter-pixdesc-yuva444p9be
	tests/ref/fate/filter-pixdesc-yuva444p9le
	tests/ref/fate/filter-pixdesc-yuvj420p
	tests/ref/fate/filter-pixdesc-yuvj422p
	tests/ref/fate/filter-pixdesc-yuvj440p
	tests/ref/fate/filter-pixdesc-yuvj444p
	tests/ref/fate/filter-pixdesc-yuyv422
	tests/ref/fate/filter-pixdesc-yvyu422
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-crop
	tests/ref/fate/filter-pixfmts-hflip
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-pad
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip
	tests/ref/fate/filter-scale200
	tests/ref/fate/filter-scale500
	tests/ref/fate/filter-vflip
	tests/ref/fate/filter-vflip_crop
	tests/ref/fate/filter-vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5e19651c

Merge commit '' · 1cf81a2c

Michael Niedermayer authored May 10, 2015

* commit '379e5603':
  id3v2: Do not export empty APIC description

Conflicts:
	libavformat/id3v2.c

See: b697b297Merged-by: Michael Niedermayer <michaelni@gmx.at>

1cf81a2c

Merge commit '' · f230451b

Michael Niedermayer authored May 10, 2015

* commit 'b9f7a677':
  png: Set the color range as full range

Conflicts:
	libavcodec/pngdec.c

See: 72e75531Merged-by: Michael Niedermayer <michaelni@gmx.at>

f230451b

Merge commit '' · 55231323

Michael Niedermayer authored May 10, 2015

* commit '254f3dab':
  nut: Make sure to clean up on read_header failure

Conflicts:
	libavformat/nutdec.c

See: 36170266Merged-by: Michael Niedermayer <michaelni@gmx.at>

55231323

Merge commit '' · 73b8155b

Michael Niedermayer authored May 10, 2015

* commit '4d0ee496':
  avi: Validate sample_size

Conflicts:
	libavformat/avidec.c

See: ca234639
See: c7369f3aMerged-by: Michael Niedermayer <michaelni@gmx.at>

73b8155b

Merge commit '' · 8b0ceb96

Michael Niedermayer authored May 10, 2015

* commit 'b34257ee':
  nut: Check chapter creation in decode_info_header

Conflicts:
	libavformat/nutdec.c

See: 3ff1af2bMerged-by: Michael Niedermayer <michaelni@gmx.at>

8b0ceb96

Merge commit '' · ce1c0e99

Michael Niedermayer authored May 10, 2015

* commit '243e8443':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
	libavcodec/alac.c

See: 4b657a1bMerged-by: Michael Niedermayer <michaelni@gmx.at>

ce1c0e99

dashenc: Reduce the segment duration if cutting out parts with edit lists · b8d2630c

Martin Storsjö authored May 10, 2015

This makes sure that the time + duration of the first segment
matches the start time of the next segment for e.g. AAC audio
with encoder delay.
Signed-off-by: Martin Storsjö <martin@martin.st>

b8d2630c

dashenc: replace attribute id with contentType for the AdaptationSet element · ac1a1cb9

James Almer authored May 10, 2015

id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.

This fixes an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

ac1a1cb9

Merge commit '' · 918c5ea4

Michael Niedermayer authored May 10, 2015

* commit '295e05a7':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
	libavcodec/apedec.c

See: 699341d6Merged-by: Michael Niedermayer <michaelni@gmx.at>

918c5ea4

avformat/wavenc: Check umid length · 004564c9
Michael Niedermayer authored May 10, 2015
```
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
004564c9
avformat/wavenc: fix string length variable types · ecb4ae78
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ecb4ae78
avcodec/ppc/h264qpel_template: Fix alignment assert · d0b29428
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d0b29428
postproc/postprocess: Use size_t to hold strlen()s value · 07cb6bf9
Michael Niedermayer authored May 10, 2015
```
This should make no difference but its more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
07cb6bf9
avformat/nutenc: Fix writing strings larger than 2gb · d66b623a
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d66b623a

avutil/dict: Use size_t for appending strings · 4c128ea1

Michael Niedermayer authored May 10, 2015

the string length is not constrained to INT_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4c128ea1

libavutil/mem: use size_t for the length in av_strdup() · 4950bd4e
Michael Niedermayer authored May 10, 2015
```
the string length is not constrained to INT_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4950bd4e
swscale/x86/swscale: Fix warning about loosing significant bits in cast · 54e64eaf
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
54e64eaf
avformat/http: Mark lower_proto as const in http_listen() · a649f36f
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a649f36f
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time · 3d65570f
Michael Niedermayer authored May 07, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3d65570f
avformat/mxf: Simplify PRINT_KEY() · 8b42b222
Michael Niedermayer authored May 07, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8b42b222
avcodec/snowenc: set dia_size for the first pass of motion estimation too · 72910851
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
72910851

fate: Reduce the number of frames used to test video filters · 2fb02ecf

Luca Barbato authored May 09, 2015

Use 5 frames for video filter tests and a single one for the
pixelformat tests.

Greatly reduces the test duration without reducing coverage.

2fb02ecf

avformat_alloc_context: initialize raw_packet_buffer_remaining_size. · 5af62127

Reimar Döffinger authored May 09, 2015

This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

5af62127

avcodec/snowenc: correct fullpel search pattern · 58201c6e

Michael Niedermayer authored May 10, 2015

No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

58201c6e

09 May, 2015 11 commits

avcodec/snowenc: Fix used reference MV in fullpel iterative ME · db6d0a5b

Michael Niedermayer authored May 09, 2015

This very very slightly improves quality, no measurable speed change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

db6d0a5b

avcodec/snowenc: change log level for iterative ME information to debug level · f349703e

Michael Niedermayer authored May 09, 2015

The printed stuff should be useless to the average user and its certainly
not an error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f349703e

avcodec/snowenc: add intra_penalty AVOption · b6229780

Michael Niedermayer authored May 09, 2015

This allows favoring intra or inter blocks by a user specified amount.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b6229780

avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with... · cf31e2df

Michael Niedermayer authored May 09, 2015

avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cf31e2df

avcodec/mpeg12dec: Fix "-flags +gray" · 33529104
Michael Niedermayer authored May 09, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
33529104

id3v2: Do not export empty APIC description · 379e5603

wm4 authored May 08, 2015

APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

379e5603

png: Set the color range as full range · b9f7a677
wm4 authored May 08, 2015
```
The format uses full range for the gray formats.

CC: libav-stable@libav.org
```
b9f7a677
nut: Make sure to clean up on read_header failure · 254f3dab
Luca Barbato authored Apr 29, 2015
```
Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.

CC: libav-stable@libav.org
```
254f3dab

avi: Validate sample_size · 4d0ee496

Andreas Cadhalpun authored May 06, 2015

And either error out or set it to 0 if it is negative.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

4d0ee496

cmdline: Check options array for not working flag combinations · 876c89a8
Michael Niedermayer authored May 09, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
876c89a8
ffmpeg_opt: Fix -timestamp parsing · 107e4da4
Michael Niedermayer authored May 09, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
107e4da4