Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
fc2e022a
Commit
fc2e022a
authored
Jan 29, 2021
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/tiff: use av_packet_alloc() to allocate AVPackets
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
6ef104cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
tiff.c
libavcodec/tiff.c
+8
-6
No files found.
libavcodec/tiff.c
View file @
fc2e022a
...
@@ -58,6 +58,7 @@ typedef struct TiffContext {
...
@@ -58,6 +58,7 @@ typedef struct TiffContext {
/* JPEG decoding for DNG */
/* JPEG decoding for DNG */
AVCodecContext
*
avctx_mjpeg
;
// wrapper context for MJPEG
AVCodecContext
*
avctx_mjpeg
;
// wrapper context for MJPEG
AVPacket
*
jpkt
;
// encoded JPEG tile
AVFrame
*
jpgframe
;
// decoded JPEG tile
AVFrame
*
jpgframe
;
// decoded JPEG tile
int
get_subimage
;
int
get_subimage
;
...
@@ -877,7 +878,6 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
...
@@ -877,7 +878,6 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
int
tile_byte_count
,
int
dst_x
,
int
dst_y
,
int
w
,
int
h
)
int
tile_byte_count
,
int
dst_x
,
int
dst_y
,
int
w
,
int
h
)
{
{
TiffContext
*
s
=
avctx
->
priv_data
;
TiffContext
*
s
=
avctx
->
priv_data
;
AVPacket
jpkt
;
uint8_t
*
dst_data
,
*
src_data
;
uint8_t
*
dst_data
,
*
src_data
;
uint32_t
dst_offset
;
/* offset from dst buffer in pixels */
uint32_t
dst_offset
;
/* offset from dst buffer in pixels */
int
is_single_comp
,
is_u16
,
pixel_size
;
int
is_single_comp
,
is_u16
,
pixel_size
;
...
@@ -887,9 +887,9 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
...
@@ -887,9 +887,9 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
/* Prepare a packet and send to the MJPEG decoder */
/* Prepare a packet and send to the MJPEG decoder */
av_
init_packet
(
&
jpkt
);
av_
packet_unref
(
s
->
jpkt
);
jpkt
.
data
=
(
uint8_t
*
)
s
->
gb
.
buffer
;
s
->
jpkt
->
data
=
(
uint8_t
*
)
s
->
gb
.
buffer
;
jpkt
.
size
=
tile_byte_count
;
s
->
jpkt
->
size
=
tile_byte_count
;
if
(
s
->
is_bayer
)
{
if
(
s
->
is_bayer
)
{
MJpegDecodeContext
*
mjpegdecctx
=
s
->
avctx_mjpeg
->
priv_data
;
MJpegDecodeContext
*
mjpegdecctx
=
s
->
avctx_mjpeg
->
priv_data
;
...
@@ -898,7 +898,7 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
...
@@ -898,7 +898,7 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
mjpegdecctx
->
bayer
=
1
;
mjpegdecctx
->
bayer
=
1
;
}
}
ret
=
avcodec_send_packet
(
s
->
avctx_mjpeg
,
&
jpkt
);
ret
=
avcodec_send_packet
(
s
->
avctx_mjpeg
,
s
->
jpkt
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error submitting a packet for decoding
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error submitting a packet for decoding
\n
"
);
return
ret
;
return
ret
;
...
@@ -2158,7 +2158,8 @@ static av_cold int tiff_init(AVCodecContext *avctx)
...
@@ -2158,7 +2158,8 @@ static av_cold int tiff_init(AVCodecContext *avctx)
/* Allocate JPEG frame */
/* Allocate JPEG frame */
s
->
jpgframe
=
av_frame_alloc
();
s
->
jpgframe
=
av_frame_alloc
();
if
(
!
s
->
jpgframe
)
s
->
jpkt
=
av_packet_alloc
();
if
(
!
s
->
jpgframe
||
!
s
->
jpkt
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
/* Prepare everything needed for JPEG decoding */
/* Prepare everything needed for JPEG decoding */
...
@@ -2194,6 +2195,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
...
@@ -2194,6 +2195,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
av_freep
(
&
s
->
fax_buffer
);
av_freep
(
&
s
->
fax_buffer
);
s
->
fax_buffer_size
=
0
;
s
->
fax_buffer_size
=
0
;
av_frame_free
(
&
s
->
jpgframe
);
av_frame_free
(
&
s
->
jpgframe
);
av_packet_free
(
&
s
->
jpkt
);
avcodec_free_context
(
&
s
->
avctx_mjpeg
);
avcodec_free_context
(
&
s
->
avctx_mjpeg
);
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment