Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
3e79c2ad
Commit
3e79c2ad
authored
13 years ago
by
Martin Storsjö
Browse files
Options
Downloads
Patches
Plain Diff
libavformat: Add a utility function for adding parameter change side data
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
fe75dc85
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavformat/internal.h
+8
-0
8 additions, 0 deletions
libavformat/internal.h
libavformat/utils.c
+43
-0
43 additions, 0 deletions
libavformat/utils.c
with
51 additions
and
0 deletions
libavformat/internal.h
+
8
−
0
View file @
3e79c2ad
...
@@ -299,4 +299,12 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index,
...
@@ -299,4 +299,12 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index,
void
avpriv_set_pts_info
(
AVStream
*
s
,
int
pts_wrap_bits
,
void
avpriv_set_pts_info
(
AVStream
*
s
,
int
pts_wrap_bits
,
unsigned
int
pts_num
,
unsigned
int
pts_den
);
unsigned
int
pts_num
,
unsigned
int
pts_den
);
/**
* Add side data to a packet for changing parameters to the given values.
* Parameters set to 0 aren't included in the change.
*/
int
ff_add_param_change
(
AVPacket
*
pkt
,
int32_t
channels
,
uint64_t
channel_layout
,
int32_t
sample_rate
,
int32_t
width
,
int32_t
height
);
#endif
/* AVFORMAT_INTERNAL_H */
#endif
/* AVFORMAT_INTERNAL_H */
This diff is collapsed.
Click to expand it.
libavformat/utils.c
+
43
−
0
View file @
3e79c2ad
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
#include
"avio_internal.h"
#include
"avio_internal.h"
#include
"internal.h"
#include
"internal.h"
#include
"libavcodec/internal.h"
#include
"libavcodec/internal.h"
#include
"libavcodec/bytestream.h"
#include
"libavutil/opt.h"
#include
"libavutil/opt.h"
#include
"libavutil/dict.h"
#include
"libavutil/dict.h"
#include
"libavutil/pixdesc.h"
#include
"libavutil/pixdesc.h"
...
@@ -4017,3 +4018,45 @@ int avformat_network_deinit(void)
...
@@ -4017,3 +4018,45 @@ int avformat_network_deinit(void)
#endif
#endif
return
0
;
return
0
;
}
}
int
ff_add_param_change
(
AVPacket
*
pkt
,
int32_t
channels
,
uint64_t
channel_layout
,
int32_t
sample_rate
,
int32_t
width
,
int32_t
height
)
{
uint32_t
flags
=
0
;
int
size
=
4
;
uint8_t
*
data
;
if
(
!
pkt
)
return
AVERROR
(
EINVAL
);
if
(
channels
)
{
size
+=
4
;
flags
|=
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT
;
}
if
(
channel_layout
)
{
size
+=
8
;
flags
|=
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT
;
}
if
(
sample_rate
)
{
size
+=
4
;
flags
|=
AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE
;
}
if
(
width
||
height
)
{
size
+=
8
;
flags
|=
AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS
;
}
data
=
av_packet_new_side_data
(
pkt
,
AV_PKT_DATA_PARAM_CHANGE
,
size
);
if
(
!
data
)
return
AVERROR
(
ENOMEM
);
bytestream_put_le32
(
&
data
,
flags
);
if
(
channels
)
bytestream_put_le32
(
&
data
,
channels
);
if
(
channel_layout
)
bytestream_put_le64
(
&
data
,
channel_layout
);
if
(
sample_rate
)
bytestream_put_le32
(
&
data
,
sample_rate
);
if
(
width
||
height
)
{
bytestream_put_le32
(
&
data
,
width
);
bytestream_put_le32
(
&
data
,
height
);
}
return
0
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment