[rbp] [retroplayer] Add zero copy mmal support to retroplayer #62

popcornmix · 2016-07-13T13:01:13Z

No description provided.

popcornmix · 2016-07-13T13:01:55Z

Probably not working, but it does compile. I'm not currently able to build the emulator add-ons - getting "bnes needs RPi build command in CMakeLists.txt!"

garbear · 2016-07-13T23:14:34Z

I'm not sure why this worked before but not now, you can see the error msg is here and results from the "rbpi" platform not having a build command. If it worked before, it was probably because it was using the "linux" core system name. Which of these is it set to currently?

popcornmix · 2016-07-14T12:24:02Z

I'm not 100% sure if I used the emulators I built last time, or the ones from LE repo.
However if I ignore the add-ons that report "needs RPi build command", it still fails with:

CMake Error at /usr/local/lib/kodi/addon-helpers.cmake:131 (message):
CMAKE_INSTALL_PREFIX /opt/xbmc-retro/arm-linux-gnueabihf differs from Kodi
prefix /usr/local. Please pass -DOVERRIDE_PATHS=1 to skip this check

garbear · 2016-07-14T22:01:15Z

Hm, I've encountered this problem before. I applied adfc09f, but I can't remember if this fixed the problem or not.

garbear · 2016-07-20T19:32:45Z

Is it fine if I merge this now? I'll keep the commits separate and if there's any changes you can just send another PR to this branch.

popcornmix · 2016-07-20T19:35:48Z

A mmal commit has just gone into master which has a minor conflict with this.
You can merge this now, but you will likely hit the conflict when you next rebase.

If you update retroplayer-17alpha2 branch I can rebase this commit now,
or you can give me a ping in future if you get a conflict.

garbear · 2016-07-20T20:10:34Z

which PR? I'll cherry pick it and you can rebase on that, then next time I rebase on a release (alpha 3) this will apply cleanly

popcornmix · 2016-07-20T20:33:07Z

xbmc#10120

popcornmix · 2016-07-20T20:34:01Z

(although you might need xbmc#10144 to apply that one...)

garbear · 2016-07-20T20:57:41Z

I cherry-picked that PR (and 4 others it required), but this PR still applies cleanly. Are these PRs needed?

popcornmix · 2016-07-20T21:07:58Z

I had a conflict here: 4828fc2#diff-c7916b114ea763a60c3ab748710a75d7R279
on my own tree as that line is no longer present on master...

I am in the process of building with adfc09f present to see if that fixes my issue.

With xbmc#10120 in place 18028ae can be dropped (although the next commit will need fixing up).

garbear · 2016-07-20T21:37:35Z

I plan to rebase on 17 alpha 3 when it's released (around 1 August), do you just want to wait until then?

popcornmix · 2016-07-20T21:38:33Z

I've rebased. Hit a build error:

xbmc/tools/depends/target/binary-addons/arm-linux-gnueabihf/build/peripheral.joystick/src/addon.cpp:288:31: error: 'class JOYSTICK::CJoystick' has no member named 'SupportsPowerOff'
   if (!joystick || !joystick->SupportsPowerOff())

Any ideas?

garbear · 2016-07-20T21:43:20Z

xbmc#9663 adds power off support to the Peripheral API. My alpha 2 branch is applied on top of this PR. it looks like you're trying to build against master's headers, try building against RetroPlayer's peripheral API.

popcornmix · 2016-07-20T21:45:04Z

Are you just saying a need to do a clean build from this branch?

I think the new commit have also broken something:

RetroPlayerAudio.cpp: In member function 'virtual bool GAME::CRetroPlayerAudio::OpenEncodedStream(AVCodecID, unsigned int, const CAEChannelInfo&)':
RetroPlayerAudio.cpp:121:69: error: no matching function for call to 'CDVDFactoryCodec::CreateAudioCodec(CDVDStreamInfo&, bool)'
   m_pAudioCodec.reset(CDVDFactoryCodec::CreateAudioCodec(hint, false));

garbear · 2016-07-20T22:00:40Z

This looks correct, it references [CDVDFactoryCodec::CreateAudioCodec()](https://github.com/garbear/xbmc/blob/retroplayer-17alpha2/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h#L44]. The third parameter (bool) is optional, so calling with a CDVDStreamInfo& and a bool should compile.

Previously we would always wait an extra vsync (even if one had been missed) in RenderUpdate. Now if a single vsync is missed, we won't wait.

Pool containing mmal buffers (e.g. decoded pictures) need to be attached to a mmal components port. Managing the lifespan of these is tricky, as renderer may consitue to display an image after the decoder has been closed and a new one opened. So create a class for handling this. The class creates and destroys the mmal component associated with the pool, and creates the mmal pool (which is just headers) as well as handling allocation of the gpu buffers. Each object from the pool includes a shared pointer to the pool class, ensuring the pool and mmal component are not destroyed until the last object is destroyed. The pool class is used by both MMAL hw decode and the FFMPEG zero copy decoders which avoids some special casing in the renderer. It will also handle the pool of deinterlaced frames later.

mmal callbacks all come from a common thread, so blocking in a callback is inefficient at best and can risk deadlocks. Creating a dedicated thread for processing mmal buffers (including the reconfiguration when formats change) avoids this.

popcornmix · 2016-07-21T15:25:17Z

I've rebased, but I'm struggling to run anything. Previously I was using this repo:
https://retroplayer.freestylephenoms.com/8.0/RPi2/arm/addons.xml

I get as far as my code;

16:20:45 T:1661989904    INFO: RetroPlayerVideo: Creating video stream with pixel format: 44, 320x240
16:20:45 T:1661989904   DEBUG: CPixelConverter::Open: pixfmt:44(rgb565le) targetfmt:44(rgb565le) 320x240

but get a segfault from the game itself (e.g. 2048 or MAME 2010). Is that repo up to date with this branch's API?

popcornmix · 2016-07-22T15:47:28Z

Finally got retroplayer working again on Pi.
I've updated this PR to include the upstream MMAL render commits plus updated support for MMAL rendering from retroplayer

I did find the second game I ran always crashes. Looks to be a bug here:
kodi-game/game.libretro@68d6351#commitcomment-18360022
(possibly combined with something adding but not removing input ports).

But this PR should be okay for merging.

garbear · 2016-08-05T18:55:16Z

Cheers. I'll fix the game.libretro issue

Thanks to elpendor for RGB565 support, poisson for RAII improvements, ChrisMyhre for catching a compile error, notspiff for CMake fixes and popcornmix for Raspberry Pi support (#62). The RetroPlayer commit from the retroplayer-15.2 branch (20975ad) contains a TODO about `g_renderManager.IsStarted()` that may or may not apply still.

garbear · 2016-08-09T02:57:16Z

The crash should be fixed now. I'm uploading builds for the new branch based on 17alpha3

[addons] cleanup and improve changes

garbear force-pushed the retroplayer-17alpha2 branch from 092261f to 5cbfc1b Compare July 20, 2016 20:55

popcornmix force-pushed the retroplayer branch from db8f451 to bd82468 Compare July 20, 2016 21:16

garbear force-pushed the retroplayer-17alpha2 branch from 5cbfc1b to f878af2 Compare July 20, 2016 21:38

popcornmix added 10 commits July 21, 2016 16:05

rbp: Make debug message wrap safe

80eed64

mmalrender: Allow a frame of slop when waiting for vsync

ea3e5c3

Previously we would always wait an extra vsync (even if one had been missed) in RenderUpdate. Now if a single vsync is missed, we won't wait.

mmalcodec: Use lock Leave rather than SingleExit

2b75b82

mmalcodec: Clear flags before returning picture

6a69d32

mmalcodec: Remove deinterlace support

aa2f4c8

mmal: Remove renderer pointer from codecs

c6f6021

mmal: Fix some ugliness with acquire/release of video buffers

9954519

mmalrender: Add deinterlace support

6ae17cf

popcornmix force-pushed the retroplayer branch from bd82468 to 8772f62 Compare July 21, 2016 15:22

popcornmix force-pushed the retroplayer branch 2 times, most recently from ebde7c3 to 1c6c38e Compare July 22, 2016 14:13

[rbp] [retroplayer] Initial support for mmal renderer

7c40353

popcornmix force-pushed the retroplayer branch 2 times, most recently from f1da25a to 3cb1e3d Compare July 22, 2016 15:43

popcornmix added 2 commits July 22, 2016 16:45

[retroplayer] [rbp] Switch to Pi version of PixelConverter

df46b3d

[mmal] Allow more RGB formats to be allocated

f263c69

popcornmix force-pushed the retroplayer branch from 3cb1e3d to f263c69 Compare July 22, 2016 15:45

garbear merged commit 285a242 into garbear:retroplayer-17alpha2 Aug 5, 2016

popcornmix deleted the retroplayer branch August 5, 2016 18:55

garbear pushed a commit that referenced this pull request Jan 4, 2017

Merge pull request #62 from AlwinEsch/binaray-addon-part

2d84a54

[addons] cleanup and improve changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[rbp] [retroplayer] Add zero copy mmal support to retroplayer #62

[rbp] [retroplayer] Add zero copy mmal support to retroplayer #62

popcornmix commented Jul 13, 2016

popcornmix commented Jul 13, 2016

garbear commented Jul 13, 2016

popcornmix commented Jul 14, 2016

garbear commented Jul 14, 2016 •

edited

Loading

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 21, 2016

popcornmix commented Jul 22, 2016

garbear commented Aug 5, 2016

garbear commented Aug 9, 2016

[rbp] [retroplayer] Add zero copy mmal support to retroplayer #62

[rbp] [retroplayer] Add zero copy mmal support to retroplayer #62

Conversation

popcornmix commented Jul 13, 2016

popcornmix commented Jul 13, 2016

garbear commented Jul 13, 2016

popcornmix commented Jul 14, 2016

garbear commented Jul 14, 2016 • edited Loading

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 20, 2016

garbear commented Jul 20, 2016

popcornmix commented Jul 21, 2016

popcornmix commented Jul 22, 2016

garbear commented Aug 5, 2016

garbear commented Aug 9, 2016

garbear commented Jul 14, 2016 •

edited

Loading