Skip to content

enable MMALPythonSource to send MJPEG and H264 streams #460

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

Open
barney-NG wants to merge 4 commits into
base: master
Choose a base branch
from
Open

enable MMALPythonSource to send MJPEG and H264 streams #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
165d3f8
enable MMALPythonSource to send H264 and MJPEG streams
barney-NG Jan 16, 2018
7543a83
enable MMALPythonSource to send H264 and MJPEG streams
barney-NG Jan 16, 2018
4b9b918
simple mmal h264 video player
barney-NG Jan 16, 2018
294f7ac
the doc example should look something like this
barney-NG Jan 19, 2018
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
43 changes: 43 additions & 0 deletions docs/examples/mmal_h264_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
from picamera import mmal,mmalobj as mo

source = mo.MMALPythonSource('test.h264')
decoder = mo.MMALVideoDecoder()
preview = mo.MMALRenderer()

# read the input as h264
source.outputs[0].format = mmal.MMAL_ENCODING_H264
source.outputs[0].framerate = 25
source.outputs[0].framesize = (1280,720)
source.outputs[0].commit()

# decoder input port
decoder.inputs[0].copy_from(source.outputs[0])
decoder.inputs[0].commit()

# decoder output port
decoder.outputs[0].copy_from(decoder.inputs[0])
decoder.outputs[0].format = mmal.MMAL_ENCODING_I420
decoder.outputs[0].commit()

# connect source -> decoder -> preview
decoder.inputs[0].connect(source.outputs[0])
decoder.inputs[0].connection.enable()
preview.inputs[0].connect(decoder.outputs[0])

# enable everything
preview.enable()
decoder.enable()
source.enable()

# start decoding
try:
print "***** start decoding *****"
source.wait(15)

finally:
print "***** done *****"
source.disable()
decoder.disable()
preview.disable()


12 changes: 9 additions & 3 deletions picamera/mmalobj.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2592,6 +2592,8 @@ class MMALPythonPort(MMALObject):

_FORMAT_BPP = {
'I420': 1.5,
'H264': 2,
'MJPEG': 2,
'RGB3': 3,
'RGBA': 4,
'BGR3': 3,
Expand All @@ -2609,6 +2611,8 @@ def __init__(self, owner, port_type, index):
self._type = port_type
self._index = index
self._supported_formats = {
mmal.MMAL_ENCODING_H264,
mmal.MMAL_ENCODING_MJPEG,
mmal.MMAL_ENCODING_I420,
mmal.MMAL_ENCODING_RGB24,
mmal.MMAL_ENCODING_BGR24,
Expand Down Expand Up @@ -2762,7 +2766,7 @@ def commit(self):
video = self._format[0].es[0].video
try:
self._buffer_size = int(
MMALPythonPort._FORMAT_BPP[str(self.format)]
MMALPythonPort._FORMAT_BPP[mmal.FOURCC_str(self.format)]
* video.width
* video.height)
except KeyError:
Expand Down Expand Up @@ -3167,7 +3171,7 @@ def _send_run(self):
video = self._outputs[0]._format[0].es[0].video
try:
framesize = (
MMALPythonPort._FORMAT_BPP[str(self._outputs[0].format)]
MMALPythonPort._FORMAT_BPP[mmal.FOURCC_str(self._outputs[0].format)]
* video.width
* video.height)
except KeyError:
Expand All @@ -3191,11 +3195,13 @@ def _send_run(self):
# if there's no readinto() method, fallback on
# read() and the data setter (memmove)
buf.data = self._stream.read(buf.size)
buf.length = len(buf.data)
else:
buf.data = self._stream.read(send)
buf.length = len(buf.data)
if frameleft is not None:
frameleft -= buf.length
if not frameleft:
if frameleft <= 0:
buf.flags |= mmal.MMAL_BUFFER_HEADER_FLAG_FRAME_END
frameleft = framesize
if not buf.length:
Expand Down