Derek Buitenhuis
f09fd96cee
Merge commit '99dde60391cade40ae026b9e385a5280be6b9882'
...
* commit '99dde60391cade40ae026b9e385a5280be6b9882':
svq3: move {ref,mv}_cache to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
c0b51aa2d2
Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'
...
* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
svq3: rip out the svq3-relevant parts of pred_motion() out of h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
fed686af23
Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'
...
* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
svq3: move edge_emu_buffer to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
463de5625b
Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe'
...
* commit '527bf5f7c6890664b0f1dccd42397f4d204659fe':
svq3: move the pred mode variables to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
a2922b5d61
Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'
...
* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
c18535399d
Merge commit '1877712c586df2261f2806f45388c77592b89d1e'
...
* commit '1877712c586df2261f2806f45388c77592b89d1e':
svq3: move mb_{x,y,xy} to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
7dca134285
Merge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600'
...
* commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600':
svq3: eliminate write_back_intra_pred_mode() usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
47bb289170
Merge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3'
...
* commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3':
svq3: add all the required dsp contexts into SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
656b071a8f
Merge commit '15b0517da986b312fc2fcb364a92db328380b15b'
...
* commit '15b0517da986b312fc2fcb364a92db328380b15b':
svq3: make the dsp functions static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
d6f01c61ed
Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'
...
* commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776':
h264: remove the svq3-specific code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Ivan Uskov
b577a54a7c
qsv: Fix wrong ticks_per_frame for H.264
...
For H.264 stream ticks_per_frame should be 2, as per the docs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Umair Khan
a2ba50b03a
avcodec/alsdec: Fix bitstream reading
...
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Paul B Mahol
1f62a6e780
avcodec/shorten: make max frame size bigger if custom block size was used
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Michael Niedermayer
566d64d4fb
avcodec/h264: Only recover from reference pictures
...
Fixes spec compliance
Fixes Ticket5346
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
4efd3ec50a
avcodec/svq3: fix assert type (was av_assert2 in h264 from where this was copied)
...
Type was lost in f8d1bb2f2c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
005c61c6b8
avcodec/ttaenc: Reallocate packet if its too small
...
Fixes assertion failure
Fixes Ticket5394
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Rodger Combs
e1c20485c1
lavc/audiotoolboxdec: move to new BSF API
9 years ago
Rodger Combs
95116bf35f
lavc/audiotoolboxdec: fix memory leak
9 years ago
Nicolas George
0cb19c30c6
lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.
...
Fix remuxing H.264-in-MP4 to Matroska, possibly others.
9 years ago
Nicolas George
b8fa374fb6
lavf/concatdec: remove unrelated change during codecpar merge.
...
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461 .
9 years ago
Derek Buitenhuis
f8d1bb2f2c
Merge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'
...
* commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c':
svq3: rip out the mb decoding code shared with h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
ee38234c43
Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'
...
* commit 'e481458bc308ee838deaeacac51929514762e7a7':
h264: factor out pred weight table parsing into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
79aafd43fd
Merge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'
...
* commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386':
h2645_parse: compute the actual data length, without trailing paddding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
438ed974b8
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
...
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
h2645_parse: add support for parsing h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
b5c10c4c92
Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c'
...
* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
h2645_parse: change the AVCodecContext* parameter to void*
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
8e73574d4f
Merge commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe'
...
* commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe':
h2645_parse: add a function for uninitializing the packet
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
3c4ca4c5d7
Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
...
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
hevc_parse: rename into h2645_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
492d229303
qsvenc_hevc: Fix usage of ff_hevc_extract_rbsp
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Martin Vignali
3ce19882c5
libavcodec/exr: move xsize and ysize to thread data
...
Fixes slice threading.
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
Derek Buitenhuis
4791a910c0
lavc/hevc_parse: Don't take a HEVCContext
...
It's not even used anymore, and the checks are no longer
functionally important.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Michael Niedermayer
9ac154d1fa
avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
...
Fixes Ticket5319
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Jan Ekström
9779b62624
pgssubdec: fix subpicture output colorspace and range
...
Functionality used before didn't widen the values from limited to
full range. Additionally, now the decoder uses BT.709 where it
should be used according to the video resolution.
Default for not yet set colorimetry is BT.709 due to most observed
HDMV content being HD.
BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.
Fixes #4637
9 years ago
Derek Buitenhuis
87b8e95008
Merge commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873'
...
* commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873':
aarch64: Make transpose_4x4H do a regular transpose
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
4fe4c5c376
Merge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'
...
This merge is a no-op.
* commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e':
rtpdec_jpeg: fix low contrast image on low quality setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
896fce8509
Merge commit '159323897f545e7405fb9db234e0ba123e174376'
...
* commit '159323897f545e7405fb9db234e0ba123e174376':
intrax8: Add a local BlockDSPContext and initialize it
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
52692eed61
Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
...
* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
intrax8: Reference the current AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
50fa5715bc
Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
...
* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
93c61c980d
Merge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'
...
* commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0':
intrax8: Use a constant buffer instead of a ScratchpadContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
36dad14693
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
...
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
e5c655b098
Merge commit '577393321c389ad2973bec6168a8045c94a9e099'
...
* commit '577393321c389ad2973bec6168a8045c94a9e099':
intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
83e0b1b1d7
Merge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'
...
* commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a':
intrax8: Keep a reference to the context idctdsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
627115b3e4
Merge commit '65127450add50c3bca307edc0517d2e8382717a0'
...
* commit '65127450add50c3bca307edc0517d2e8382717a0':
intrax8: Make x8_init_block_index not use mpegvideo fields
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
1a9ffc59d2
Merge commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'
...
* commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f':
intrax8: Use local destination buffers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
9809371aa5
Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
...
* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Derek Buitenhuis
a5a6621616
Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
...
* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Michael Niedermayer
2e67a99fbc
avfilter/vf_drawtext: Check return code of load_glyph()
...
Fixes segfault
Fixes Ticket5347
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Derek Buitenhuis
64ae08ffec
Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
...
* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db':
h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
Michael Niedermayer
c84ba07db4
avformat/mux: Check that deinit is set before calling it
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
dbe1dd59e0
avformat/mpegts: Skip over broken 0x80 headers
...
This fixes demuxing of 01c56b0dc1.ts
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
ea41ab0987
avformat/mpegts: factor duplicate seek back code into mpegts_resync
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago