Commit Graph

587 Commits

Author SHA1 Message Date
Cedric BAIL 8296e98d8b emotion: properly test the existence of an X connection in gstreamer backend.
SVN revision: 66606
2011-12-28 16:08:38 +00:00
Iván Briano 0229df2b1e Define EMOTION_BUILD on compile so EAPI is defined correctly
SVN revision: 66605
2011-12-28 15:50:40 +00:00
Iván Briano 52492193fa EAPIfy external variables
SVN revision: 66600
2011-12-28 14:44:38 +00:00
Iván Briano e421ac90b7 Don't override standard variables, it looks weird. In turn, fix building with automake 1.11.2
SVN revision: 66599
2011-12-28 14:13:30 +00:00
Carsten Haitzler 823e551f47 clean up emotion copying to match the rest of core efl thats bsd
licensed.



SVN revision: 66243
2011-12-15 09:35:57 +00:00
Cedric BAIL ca142c2404 emotion: turn fps debugging on also on classic Gstreamer.
SVN revision: 65955
2011-12-06 11:36:29 +00:00
Cedric BAIL 3d139c9888 emotion: no segv when no webcam has been detected.
SVN revision: 65137
2011-11-13 21:52:13 +00:00
Cedric BAIL eb07790bed emotion: fix requirements. Thanks Vincent.
SVN revision: 65023
2011-11-10 14:24:49 +00:00
Bruno Dilly 3d38f4d08e Emotion Test: remove unuseful funtion enter_idle
was used to show FPS before. but a long time it doesn't
do anything.


SVN revision: 65021
2011-11-10 12:24:56 +00:00
Bruno Dilly 66f18fc49f Emotion: make it build without eeze
Please, Cedric, check if it's ok.


SVN revision: 65020
2011-11-10 12:11:52 +00:00
Cedric BAIL de109574ed emotion: and now support custom pipeline in emotion.
SVN revision: 65018
2011-11-10 11:35:49 +00:00
Cedric BAIL 2fb36c52f6 emotion: make it possible to define webcam statically.
SVN revision: 64995
2011-11-09 16:27:49 +00:00
Cedric BAIL ff41dfa5b5 emotion: minor cleanup.
SVN revision: 64869
2011-11-07 15:45:24 +00:00
Cedric BAIL 14cfa65bd9 emotion: fix symbol issue.
NOTE: all inline function in header should be static or
they will export symbol and you don't want that.


SVN revision: 64765
2011-11-05 15:54:34 +00:00
Cedric BAIL 550a40340a emotion: always trigger new frame callback.
SVN revision: 64758
2011-11-05 13:44:21 +00:00
Cedric BAIL 2a248473d0 emotion: fix recursive call.
SVN revision: 64756
2011-11-05 12:04:34 +00:00
Vincent Torri 07fdd79459 Emotion: AM_PROG_CC_STDC is deprecated
SVN revision: 64746
2011-11-04 20:33:46 +00:00
Cedric BAIL eaa1a494be emotion: warning--
SVN revision: 64709
2011-11-03 17:09:23 +00:00
Cedric BAIL 93f1aa981e emotion: correctly guard Ecore_X usage.
SVN revision: 64322
2011-10-23 09:21:14 +00:00
Cedric BAIL a01bc5dae9 emotion: fix borderless and remove it from taskbar/pager at the same time.
SVN revision: 64321
2011-10-23 08:46:23 +00:00
Cedric BAIL 321cbb17e9 emotion: disable direct rendering path if window manager doesn't handle it.
SVN revision: 64256
2011-10-21 15:00:41 +00:00
Cedric BAIL 0acd0ff100 emotion: try to correctly fix the fill value.
SVN revision: 64255
2011-10-21 14:59:22 +00:00
Cedric BAIL 096a42cedd emotion: destroy all created object.
SVN revision: 64172
2011-10-19 09:42:05 +00:00
Cedric BAIL 534acda075 emotion: work with older version of gstreamer.
SVN revision: 64058
2011-10-14 04:01:43 +00:00
Cedric BAIL 7e30dac83a emotion: use Ecore_X Video Atoms.
SVN revision: 64048
2011-10-13 09:24:45 +00:00
Carsten Haitzler ecd5590952 hmm no. lets not make this alpha .. by default eh?
SVN revision: 63881
2011-10-06 13:42:19 +00:00
Carsten Haitzler 37f505d4ce fix resize handling for emotion
SVN revision: 63868
2011-10-06 02:41:24 +00:00
Cedric BAIL 69a70ef632 emotion: FPS tracking.
SVN revision: 63830
2011-10-05 09:39:32 +00:00
Cedric BAIL 7c5cbe6e3d emotion: some docs.
SVN revision: 63820
2011-10-05 02:54:27 +00:00
Cedric BAIL a3d4b58959 emotion: forgotten svn add...
SVN revision: 63816
2011-10-04 22:46:54 +00:00
Cedric BAIL 35c9a8f56c emotion: make Xv work.
NOTE: we need the help of the window manager to make this
really work. So for the moment, it half work. As soon as I
hack E17, the Xv fast path for Emotion will only work when
used with E17 and it will fallback to canvas inlined rendering
in other case.


SVN revision: 63802
2011-10-04 11:14:58 +00:00
Rafael Antognolli 9f403ea9eb emotion/examples: Fix more warnings.
SVN revision: 63782
2011-10-03 18:39:28 +00:00
Rafael Antognolli d31851e68c emotion/generic/vlc: Remove more warnings.
SVN revision: 63781
2011-10-03 18:39:23 +00:00
Rafael Antognolli b437af7bd5 emotion/generic: Remove warnings.
Remove unused functions, variables and fix a "return" on a non-void
returning function.

SVN revision: 63780
2011-10-03 18:39:20 +00:00
Rafael Antognolli 923afe9503 emotion/build: Fix DSO build for em_generic_vlc.
SVN revision: 63779
2011-10-03 18:24:12 +00:00
Rafael Antognolli ab80242e86 emotion/generic/vlc: VLC needs to write data somewhere.
It seems that depending on the system, vlc can't use a NULL pointer to
the pixels where it should write its data.

So a small amount of memory should be allocated and passed to its
rendering callbacks (specifically, the lock callback) when the file is
being opened and decoded for the first time. Then this memory can be
freed, since the real rendering will happen on the shared memory area.

SVN revision: 63777
2011-10-03 18:19:48 +00:00
Cedric BAIL 11108ed17b emotion: forgotten declaration.
SVN revision: 63768
2011-10-03 10:29:04 +00:00
Cedric BAIL a57395a623 emotion: first try with xv.
SVN revision: 63759
2011-10-03 03:30:39 +00:00
Cedric BAIL 9eb6ef192e emotion: don't crash on empty video stream.
SVN revision: 63725
2011-09-30 15:39:16 +00:00
Cedric BAIL d3c4e4fa00 emotion: add some space around.
SVN revision: 63724
2011-09-30 15:37:28 +00:00
Cedric BAIL 796600d1a5 emotion: make it possible to dump the complete pipeline not only on failure, but also when it worked.
SVN revision: 63637
2011-09-28 05:34:30 +00:00
Cedric BAIL c07415b8bd emotion: don't use the pipeline anymore when it's not needed.
SVN revision: 63497
2011-09-20 11:04:54 +00:00
Cedric BAIL 973717b9bf emotion: correctly update position of sub-object.
SVN revision: 63496
2011-09-20 10:54:53 +00:00
Cedric BAIL d3345a5d75 emotion: remove use of xattr.
SVN revision: 63495
2011-09-20 09:40:55 +00:00
Cedric BAIL 7a591915b1 emotion: add basic xoverlay infrastructure to emotion. not ready at all yet.
SVN revision: 63482
2011-09-19 15:33:02 +00:00
Cedric BAIL aed1ed1666 emotion: disable tricky surface destruction and remove useless lock.
SVN revision: 63480
2011-09-19 12:49:20 +00:00
Rafael Antognolli f105146913 emotion/smart: Remove fprintf left after debugging.
SVN revision: 63419
2011-09-15 19:01:03 +00:00
Rafael Antognolli 4f93530ce2 emotion/doc: Add @ingroup to new functions.
SVN revision: 63417
2011-09-15 18:51:35 +00:00
Rafael Antognolli 0c4dd42a0a emotion/aspect: Add API to configure the aspect ratio policy.
The new function emotion_object_keep_aspect_set() allow to set a policy
that will automatically change the emotion object border property, based
on the video aspect ratio and object current aspect ratio.

Possible values are:
 * EMOTION_ASPECT_KEEP_NONE
 * EMOTION_ASPECT_KEEP_WIDTH
 * EMOTION_ASPECT_KEEP_HEIGHT
 * EMOTION_ASPECT_KEEP_BOTH
 * EMOTION_ASPECT_CROP
 * EMOTION_ASPECT_CUSTOM

SVN revision: 63416
2011-09-15 18:51:33 +00:00
Rafael Antognolli 5c3474beed emotion/border: Add support for selecting the border colors.
This is a simple API that implements colors for the borders specified by
emotion_object_border_set(), using a background rectangle behind the
emotion object.

SVN revision: 63415
2011-09-15 18:51:27 +00:00
Rafael Antognolli 77f43424a6 emotion/border: Add border/crop support for emotion objects.
The emotion_object_border_set/get APIs were added, allowing one to
specify a positive (border) or negative (crop) value for each of the
edjes of the video being played. This allows easier setup on an Emotion
object to keep the aspect ratio, either by adding black areas on it, or
by cropping the exceding area of the video.

NOTE: The specified border/crop is based on the original size of the
video. If it is scaled (emotion object size is different from the video
size), the borders will be scaled as well.

Patch based on an original patch sent by
Hugo Camboulive <hugo.camboulive@gmail.com>.

SVN revision: 63414
2011-09-15 18:51:23 +00:00
Cedric BAIL 8cc23a119e emotion: correctly destroy buffer.
SVN revision: 63399
2011-09-14 22:33:41 +00:00
Rafael Antognolli 47c39e976c emotion/generic: Non-blocking meta info retrieval.
SVN revision: 63238
2011-09-06 21:15:53 +00:00
Rafael Antognolli 7779d54fe4 emotion/generic: Non-blocking track info retrieval.
SVN revision: 63237
2011-09-06 21:15:50 +00:00
Rafael Antognolli cfed99689b emotion/generic: Non-blocking event reading from player.
Temporarily disabled fetching/sending of channel and meta info. Will
enable it with the next commit, to simplify code.

SVN revision: 63236
2011-09-06 21:15:46 +00:00
Rafael Antognolli b786a519be emotion/generic: Small fixes.
Update enum doc, and return 1 on success for getting shm_data.

SVN revision: 63235
2011-09-06 21:15:42 +00:00
Rafael Antognolli 636e78ee2f emotion/generic: Postpone setting some options to after open_done.
These options must be set on the player even if there's no file opened
yet. Thus, just postpone the related commands to when the player has
opened the file already.

SVN revision: 63234
2011-09-06 21:15:39 +00:00
Rafael Antognolli 2650c9d349 emotion/generic: There's no need to check the standard output.
The player stdout is not used anymore to read commands from.

SVN revision: 63233
2011-09-06 21:15:36 +00:00
Rafael Antognolli 87ff8ea15c emotion/generic: Should reset meta_info and channels on file_close.
SVN revision: 63232
2011-09-06 21:15:32 +00:00
Rafael Antognolli 2ee03004d6 emotion/generic: Don't send position update when skipping frames.
SVN revision: 63227
2011-09-06 12:37:03 +00:00
Rafael Antognolli 4be7a99b94 emotion/generic: Fix frame dropping.
Move the frame drop counter to the shared memory object, so the player
can check its value and not send new frames if we didn't "consume" the
previous one.

Also move the triple buffering pointer changing to the display function,
so it will only lock once when accessing the critical region.

SVN revision: 63220
2011-09-05 21:52:18 +00:00
Rafael Antognolli 0d7da38f05 emotion/generic: Add support for fetching meta info.
SVN revision: 63219
2011-09-05 21:52:14 +00:00
Rafael Antognolli bed7fa1c6a emotion/generic: Add audio/video/spu channel set/get/count.
SVN revision: 63218
2011-09-05 21:52:11 +00:00
Rafael Antognolli a31e5f2b24 emotion/generic - Set filename to NULL on file_close.
Otherwise if we try to call file_set(<some file>) after file_set(NULL),
it will send a close command to the player for an already closed file.

Also make the example cycle through the list of movies, but still
passing through a NULL file when reaching one of the ends of the list.

SVN revision: 63208
2011-09-05 16:37:20 +00:00
Rafael Antognolli c6ca436e79 emotion/generic: formatting.
SVN revision: 63206
2011-09-05 16:07:10 +00:00
Rafael Antognolli 93b310e15c emotion/generic: Reset initial values on file_set.
These values need to be reset as soon as a new file is set, otherwise
they can give wrong information to evas about the size of pixels to
render.

SVN revision: 63205
2011-09-05 16:07:06 +00:00
Rafael Antognolli 10621a8c15 emotion/generic: Make sure no new_frame is sent while opening or closing files.
This wasn't happening anyway, but let's make sure it won't ever happen.

SVN revision: 63204
2011-09-05 16:07:04 +00:00
Rafael Antognolli dca7c873b2 emotion/generic - Don't start opening new file when another one is being open.
SVN revision: 63203
2011-09-05 16:07:00 +00:00
Rafael Antognolli d04377d4d2 emotion/generic - Use pipes instead of stdin/stdout for communication.
Now the player will have the stdin and stdout available for anything
else, and there's no need to make line-buffering with ecore_exe anymore.

SVN revision: 63198
2011-09-05 13:12:17 +00:00
Rafael Antognolli 733fe1d444 emotion/generic: Add return value to EM_RESULT_FILE_SET_DONE.
It now checks if was possible to get the shared memory, and returns true
or false. This will command will also be used later to return false for
file opening no matter what was the problem, and maybe the int parameter
will indicate the type of error.

SVN revision: 63197
2011-09-05 13:11:53 +00:00
Cedric BAIL d7d4603f0c emotion: remove useless broken check.
SVN revision: 63190
2011-09-05 11:08:15 +00:00
Cedric BAIL 568df526af emotion: properly delay buffer destruction.
SVN revision: 63189
2011-09-05 10:57:39 +00:00
Cedric BAIL e2e66fb1ce emotion: better error message.
SVN revision: 63173
2011-09-04 21:13:49 +00:00
Cedric BAIL d6c8e07236 emotion: better handling of gstreamer samsung backend.
SVN revision: 63172
2011-09-04 21:12:34 +00:00
Gustavo Sverzut Barbieri e83e1ea1fc generic module can now be built-in as static module.
also removed sole left-overs of previous disable of vlc engine.



SVN revision: 63141
2011-09-04 00:17:06 +00:00
Gustavo Sverzut Barbieri 999e3bf306 remove old vlc, fix build bugs and introduce m4 for generic players.
Previous commit to disable VLC messed everything, so this one fixes it doing:

 - remove old src/modules/vlc and related.
 - add EMOTION_CHECK_GENERIC_PLAYER() m4 macro
 - change previous EMOTION_BUILD_VLC to EMOTION_BUILD_GENERIC_VLC



SVN revision: 63140
2011-09-04 00:07:41 +00:00
Sebastian Dransfeld b96bd7ff8f Emotion: Remove unused variables
SVN revision: 63138
2011-09-03 21:09:39 +00:00
Sebastian Dransfeld 6e4c33d8f7 Emotion: Add __UNUSED__ where needed
SVN revision: 63137
2011-09-03 21:09:35 +00:00
Sebastian Dransfeld 02b73860a2 Emotion: Fix memleak
Remove weird buffer which never gets used or free'd

SVN revision: 63136
2011-09-03 21:09:31 +00:00
Sebastian Dransfeld 9a282958c9 Emotion: Fix signed warnings
SVN revision: 63135
2011-09-03 21:09:28 +00:00
Sebastian Dransfeld 5c8e0ea66b Emotion: Add __UNUSED__ where needed
SVN revision: 63134
2011-09-03 21:09:24 +00:00
Sebastian Dransfeld 6972fe5e82 Emotion: Remove unused variables
SVN revision: 63133
2011-09-03 21:09:19 +00:00
Sebastian Dransfeld ffb22a5c4e Emotion: Really disable vlc
SVN revision: 63132
2011-09-03 20:47:28 +00:00
Cedric BAIL 565b2542a2 emotion: remove useless warning.
SVN revision: 63120
2011-09-03 12:54:06 +00:00
Cedric BAIL 64906f8485 emotion: protection against bad decoder.
SVN revision: 63118
2011-09-03 12:36:04 +00:00
Gustavo Sverzut Barbieri f567f91b7b emotion installs no AUTHORS, thus do not check it as magic file.
SVN revision: 63109
2011-09-03 05:32:00 +00:00
Cedric BAIL 4f844f63f5 emotion: resize only when needed and fix typo.
SVN revision: 63089
2011-09-02 13:10:22 +00:00
Cedric BAIL d7771445b1 emotion: remove useless code.
SVN revision: 63087
2011-09-02 08:51:56 +00:00
Gustavo Sverzut Barbieri e26e9df5b2 emotion/generic: eina module functions can be static.
SVN revision: 63081
2011-09-02 01:35:16 +00:00
Gustavo Sverzut Barbieri 5965cf014f emotion/generic/vlc: die when parent dies.
nasty fix for a nasty emotion behavior :-/



SVN revision: 63080
2011-09-02 01:34:07 +00:00
Gustavo Sverzut Barbieri acda54440e emotion/generic: make log variable static.
yeah, I'm paranoid ;-)



SVN revision: 63079
2011-09-01 23:47:53 +00:00
Gustavo Sverzut Barbieri 3bd43e9809 emotion: just try vlc if it was compiled.
not that big optimization, but does not hurt either.


SVN revision: 63078
2011-09-01 23:46:39 +00:00
Gustavo Sverzut Barbieri 3ed350c887 emotion: use eina_prefix to determine player location.
Move players from $bindir to $libdir/emotion/utils and find them with
eina_prefix. I was willing to play with this prefix thing, quite nice
;-)



SVN revision: 63077
2011-09-01 23:45:18 +00:00
Cedric BAIL e5b7c25792 emotion: handle Samsung S5PC110 and S5PC210.
SVN revision: 63076
2011-09-01 23:11:36 +00:00
Gustavo Sverzut Barbieri 11bda2bc49 emotion: test proxy of videos with -R/--reflex option.
Emotion explores some different paths in Evas pipeline as it changes
image pixels frequently and sometimes uses different
colorspaces. Let's change if it's all working fine using a nice proxy
effect that mirrors the playing video.

emotion_test --reflex <video.avi>



SVN revision: 63071
2011-09-01 21:45:04 +00:00
Rafael Antognolli a7ae4566b8 Add generic player backend (with vlc player).
This generic player backend executes a separate player in another
process. It receives the bytes to be drawn on the emotion object through
a shared memory, and communicates with the player through a pipe, using
the player standard input/output.

The player must communicate with emotion using the defined commands
specified in the Emotion_Generic_Plugin.h. It doesn't need to link
against emotion, just include this file for easier implementation.

This implementation was sponsored by Zodiac Aerospace.

SVN revision: 63062
2011-09-01 19:04:15 +00:00
Cedric BAIL 5586b1ed11 emotion: better debug infrastructure.
SVN revision: 63039
2011-08-31 15:51:50 +00:00
Cedric BAIL e1e28d7ba4 emotion: evas is going to support more video format than ffmpeg...
SVN revision: 63038
2011-08-31 15:48:47 +00:00
Cedric BAIL 0fbe1f15a3 emotion: better debugging.
SVN revision: 63012
2011-08-30 22:40:01 +00:00
Cedric BAIL bc3979229f emotion: correctly setup the pipeline for non standard colorspace.
SVN revision: 62986
2011-08-30 14:05:49 +00:00