Merge lp:~joshuascotton/entertainer/entertainer-changes into lp:entertainer

[Joshua Scotton]

[Matt Layman (mblayman)]

Is that seriously all it would take to add file support for mp4 and m4v? If we've already got the code to support them and it just meant adding them to a list of allowable types, then I'm all for this change.

Can you provide some details Josh?

review: Approve

[Joshua Scotton (joshuascotton)]

video_cache.py uses the __SUPPORTED_FILE_EXTENSIONS list to work out whether to index a file as a video file in lines 70-73 of video_cache.py:
           if not self.isFileInCache(filename) and \
                self.isSupportedFormat(filename):
                try:
                    self._addVideoFile(filename)

Hence, all you need to do to add a gstreamer supported filetype as an entertainer supported filetype is to add the extension to the __SUPPORTED_FILE_EXTENSIONS list.

I'm wondering whether there's an automated way to generate the __SUPPORTED_FILE_EXTENSIONS list in the first place, but in the meantime I've added mp4 and m4v because I know that they both work in entertainer with this change.

Music cache also has a similar list, currently:
 __SUPPORTED_FILE_EXTENSIONS = ['mp3', 'ogg']

and pictures:
SUPPORTED_FILE_EXTENSIONS = ['jpg', 'jpeg']

[Joshua Scotton (joshuascotton)]

Just to add...
Any picture which can be used as a clutter.Texture will work with our photo viewer, it would be useful to find a list of filetypes supported by clutter.Texture and also for gstreamer

[Paul Hummer (rockstar)]

I'd rather have this land in my "the-backend-shouldnt-suck-anymore" loom, to avoid conflicts. Could you please submit it against that "branch". I'll land it in one of the threads of that branch.

[Paul Hummer (rockstar)]

review: Needs Resubmitting

[Joshua Scotton (joshuascotton)]

will do

[Samuel Buffet (samuel-buffet)]

As we use the gstreamer playbin in the media_player.py, the __SUPPORTED_FILE_EXTENSIONS list depends on gstreamers plugins installed on the machine. The gstreamer playbin chose the demuxer/decoder as a function of the source and of the available plugins installed.

So maybe it could be possible to create a pipe with the typefind element to get informations about the video and audio streams and check if it is readable by gstreamer on a particular machine before indexing a file in the db.

Vote : Approve

review: Approve

Unmerged revisions

293. By Joshua Scotton on 2008-11-01

added mp4 and m4v to supported video filetypes