Skip to content

Add opaque param to add_stream_from_template #1780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyattBlue merged 1 commit into from
Feb 18, 2025
Merged

Add opaque param to add_stream_from_template #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion av/container/output.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ class OutputContainer(Container):
options: dict[str, str] | None = None,
**kwargs,
) -> VideoStream | AudioStream | SubtitleStream: ...
def add_stream_from_template(self, template: _StreamT, **kwargs) -> _StreamT: ...
def add_stream_from_template(
self, template: _StreamT, opaque: bool | None = None, **kwargs
) -> _StreamT: ...
def add_data_stream(
self, codec_name: str | None = None, options: dict[str, str] | None = None
) -> DataStream: ...
Expand Down
16 changes: 9 additions & 7 deletions av/container/output.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,24 @@ cdef class OutputContainer(Container):

return py_stream

def add_stream_from_template(self, Stream template not None, **kwargs):
def add_stream_from_template(self, Stream template not None, opaque=None, **kwargs):
"""
Creates a new stream from a template. Supports video, audio, and subtitle streams.

:param template: Copy codec from another :class:`~av.stream.Stream` instance.
:param opaque: If True, copy opaque data from the template's codec context.
:param \\**kwargs: Set attributes for the stream.
:rtype: The new :class:`~av.stream.Stream`.
"""
cdef const lib.AVCodec *codec
cdef Codec codec_obj

if template.type != "video":
if opaque is None:
opaque = template.type != "video"

if opaque: # Copy ctx from template.
codec_obj = template.codec_context.codec
else:
else: # Construct new codec object.
codec_obj = Codec(template.codec_context.codec.name, "w")
codec = codec_obj.ptr

Expand All @@ -164,10 +168,8 @@ cdef class OutputContainer(Container):
if self.ptr.oformat.flags & lib.AVFMT_GLOBALHEADER:
codec_context.flags |= lib.AV_CODEC_FLAG_GLOBAL_HEADER

# Initialise stream codec parameters to populate the codec type.
#
# Subsequent changes to the codec context will be applied just before
# encoding starts in `start_encoding()`.
# Initialize stream codec parameters to populate the codec type. Subsequent changes to
# the codec context will be applied just before encoding starts in `start_encoding()`.
err_check(lib.avcodec_parameters_from_context(stream.codecpar, codec_context))

# Construct the user-land stream
Expand Down
Loading