Motion JPEG (mjpg) support?
Scott Garman
I don't see a mime type listed for mjpeg/mjpg in the source code, and
when I point the plugin at an mjpg stream using a mime type such as
video/mpeg the plugin acts like it's buffering data but never displays
any video. Using the mplayer plugin like this used to work.
Am I not using the plugin correctly or is mjpg support still to be
added?
Thanks,
Scott Garman
Kevin DeKorte
Hash: SHA1
Can you please post the URL that is no longer working?
I tried the samples at
http://www.leadcodecs.com/Download/MCMP-MJPEG-Videos.htm
And they appear to work (the MJPEG ones).
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk1i4gACgkQ6w2kMH0L1dEygQCfQbPB/BRG1o1JFYHE2RkGd7x3
IBkAn31HQgxpAFpDx+LZUEPD2lrc1tfp
=41ol
-----END PGP SIGNATURE-----
Scott Garman
> Can you please post the URL that is no longer working?
>
> I tried the samples at
>
> http://www.leadcodecs.com/Download/MCMP-MJPEG-Videos.htm
>
> And they appear to work (the MJPEG ones).
Thanks Kevin, those examples do work for me. It looks like I may be
embedding the video in the page incorrectly. Below is a short HTML code
snippet that works with the mplayer plugin but not gecko-mediaplayer:
<html>
<head>
<title>Simple MJPEG Embed Example</title>
</head>
<body>
<h1>Simple MJPEG Embed Example</h1>
<object id="MediaPlayer">
<param name="FileName" value="bogus.mjpg">
<param name="AutoStart" value="True">
<param name="ShowControls" value="True">
<embed
src="http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpg"
type="video/mpeg" debug="true">
</embed>
</object>
</body>
</html>
The source is a Panasonic IP camera, model BB-HCM331A. I'm running
Firefox 3.0.4 under Ubuntu Hardy.
dpkg lists mplayer 2:1.0~rc2-0ubuntu13 and gnome-mplayer 0.6.0-0ubuntu2,
and mozilla-mplayer 3.50-1ubuntu2.1. During my tests I do make sure I
remove the mplayer plugin before trying gecko-mediaplayer 0.9.2.
Scott
Kevin DeKorte
Hash: SHA1
Looks ok to me...
>
> The source is a Panasonic IP camera, model BB-HCM331A. I'm running
> Firefox 3.0.4 under Ubuntu Hardy.
>
> dpkg lists mplayer 2:1.0~rc2-0ubuntu13 and gnome-mplayer 0.6.0-0ubuntu2,
> and mozilla-mplayer 3.50-1ubuntu2.1. During my tests I do make sure I
> remove the mplayer plugin before trying gecko-mediaplayer 0.9.2.
>
> Scott
Ok, I think I see your problem... you need to have gnome-mplayer 0.9.2.
gecko-mediaplayer and gnome-mplayer are pretty tightly coupled and so it
is highly recommended that you keep them at a close version.
Also, you might enable verbose debugging in gnome-mplayer and then run
firefox from a terminal and see if any useful information comes out.
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk1mSkACgkQ6w2kMH0L1dF3lQCcC8Ost4jJedcRpSorhYIT/XYc
eg8An0wbexn4pfD6o6p/To1Ef/1GZIV1
=AeXT
-----END PGP SIGNATURE-----
Scott Garman
> Ok, I think I see your problem... you need to have gnome-mplayer 0.9.2.
> gecko-mediaplayer and gnome-mplayer are pretty tightly coupled and so it
> is highly recommended that you keep them at a close version.
>
> Also, you might enable verbose debugging in gnome-mplayer and then run
> firefox from a terminal and see if any useful information comes out.
Ok, I just compiled gnome-mplayer 0.9.2 from scratch and tested that it
runs fine in standalone mode. Likewise, it can play the mjpeg tests from
Lead Codecs just fine. Still no luck with my own test page.
Here is the debug output I get when I use my simple HTML embedded mjpeg
test:
DBUS connection created
Listening to path /control/60489
ARG: src = http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
ARG: type = video/mpeg
ARG: debug = true
GNOME MPlayer v0.9.2
Running with GIO support
Using volume of 0 from gnome-mplayer preference
opening
/home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv for
localcache
vo = x11 ao = (null)
Using match: type='signal',interface='com.gnome.mplayer'
Using match: type='signal',interface='org.gnome.SettingsDaemon'
Proxy connections and Command connected
ss=0, ep = 0
bitrate = 0
ss=0, ep = 0
bitrate = 0
ss=0, ep = 0
bitrate = 0
ss=0, ep = 0
bitrate = 0
ss=0, ep = 0
bitrate = 0
there is a long pause here, and the player status bar shows that the
stream's cache has been filled, then I get more output:
Entering list_parse_qt localsize = 2048014
Item
src = http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
local = /home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv
id = 1
play = 1
path =
controlid = 0
playerready = 0
newwindow = 0
cancelled = 0
streaming = 0
loop = 0
loopcount = 0
Exiting list_parse_qt
Entering list_parse_asx localsize = 2048014
Item
src = http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
local = /home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv
id = 1
play = 1
path =
controlid = 0
playerready = 0
newwindow = 0
cancelled = 0
streaming = 0
loop = 0
loopcount = 0
Exiting list_parse_asx
Entering list_parse_qml localsize = 2048014
Item
src = http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
local = /home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv
id = 1
play = 1
path =
controlid = 0
playerready = 0
newwindow = 0
cancelled = 0
streaming = 0
loop = 0
loopcount = 0
Exiting list_parse_qml
doing file test
Streaming media
'/home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv' = 0
doing file test
Streaming media
'file:///home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv'
= 0
opening playlist
playlist detection = 0
doing file test
Streaming media
'file:///home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv'
= 0
getting file metadata for
/home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv
By contrast, here is what I'm getting when I play the Lead Codecs example:
DBUS connection created
Listening to path /control/50004
opening
/home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerxyblyy for
localcache
Entering list_parse_qt localsize = 2981888
Item
src =
http://www.leadcodecs.com/Download/MCMP-MJPEG/WhatBox_360x240_411_q25.avi
local = /home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerxyblyy
id = 0
play = 1
path =
controlid = 0
playerready = 0
newwindow = 0
cancelled = 0
streaming = 0
loop = 0
loopcount = 0
Exiting list_parse_qt
Entering list_parse_asx localsize = 2981888
Item
src =
http://www.leadcodecs.com/Download/MCMP-MJPEG/WhatBox_360x240_411_q25.avi
local = /home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerxyblyy
id = 0
play = 1
path =
controlid = 0
playerready = 0
newwindow = 0
cancelled = 0
streaming = 0
loop = 0
loopcount = 0
Exiting list_parse_asx
Entering list_parse_qml localsize = 2981888
Item
src =
http://www.leadcodecs.com/Download/MCMP-MJPEG/WhatBox_360x240_411_q25.avi
local = /home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerxyblyy
id = 0
play = 1
path =
controlid = 0
playerready = 0
newwindow = 0
cancelled = 0
streaming = 0
loop = 0
loopcount = 0
Exiting list_parse_qml
doing file test
doing file test
opening playlist
doing file test
getting file metadata for
/home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerxyblyy
doing file test
doing file test
doing file test
Thanks so much for the time you're spending to help me with this.
Scott
Kevin DeKorte
Hash: SHA1
Scott Garman wrote:
> Kevin DeKorte wrote:
>> Ok, I think I see your problem... you need to have gnome-mplayer 0.9.2.
>> gecko-mediaplayer and gnome-mplayer are pretty tightly coupled and so it
>> is highly recommended that you keep them at a close version.
>>
>> Also, you might enable verbose debugging in gnome-mplayer and then run
>> firefox from a terminal and see if any useful information comes out.
>
> Ok, I just compiled gnome-mplayer 0.9.2 from scratch and tested that it
> runs fine in standalone mode. Likewise, it can play the mjpeg tests from
> Lead Codecs just fine. Still no luck with my own test page.
>
> Here is the debug output I get when I use my simple HTML embedded mjpeg
> test:
Can you add "nocache=1" as an embed argument
<embed
src="http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpg"
type="video/mpeg" debug="true" nocache=1>
And see what that does.
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk1rX8ACgkQ6w2kMH0L1dEF/gCeL31AYlzkaP9jocRXdQCJKbgu
/c0AmwSO7IPpwAf31S5UeuMAzDa+qvf2
=62bH
-----END PGP SIGNATURE-----
Scott Garman
> Can you add "nocache=1" as an embed argument
>
> <embed
> src="http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpg"
> type="video/mpeg" debug="true" nocache=1>
>
> And see what that does.
That causes the mjpeg stream to appear (and work) in a gnome-mplayer
window that pops up. Sounds like we're getting really close.
I'll be away for the rest of this evening.
Scott
Kevin DeKorte
Hash: SHA1
Scott,
So I was looking at the code for both plugins and am not seeing anything
obvious that should cause this. Can you try the mplayerplug-in with
debug enabled and post the output (without nocache=1). BTW,
mplayerplug-in should work with that flag set as well.
So up to you if you want me to work on it more.
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk35GYACgkQ6w2kMH0L1dHxbQCeJI7WoAJl968thPGbsExWrPhk
950An2KU8xdkmiWJkTjmntiPZImus8PW
=67Y6
-----END PGP SIGNATURE-----
Scott Garman
> So I was looking at the code for both plugins and am not seeing anything
> obvious that should cause this. Can you try the mplayerplug-in with
> debug enabled and post the output (without nocache=1). BTW,
> mplayerplug-in should work with that flag set as well.
Ok. The first thing I'll note is that the mplayer plugin does not open
mplayer in a separate window when I enable the nocache option. I've also
tried testing this in a separate user account environment with an
instance of Firefox that has no extensions installed with no difference
(grasping at straws a bit here).
Here is the debug output using the mplayer plugin without the nocache
option (compare this to output from my 12/2 @ 4:29 PM EST email):
New window! old: 0x0 new 0x60820177
Size: 8 68 0x3a00ad1
Size: 240x200
resizing widgets to 240 x 200
back in SetWindow
New Size: 240x200
resizing widgets to 240 x 200
resizing widgets to 240 x 200
resizing widgets to 240 x 200
resizing widgets to 240 x 200
resizing widgets to 240 x 200
exiting URL base with http://10.0.3.253/
using url for url
url http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
buffer http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
ready to setup threads
creating thread - NP_EMBED
creating player thread
In launchPlayerThread, state = 110
launchPlayerThread - creating new thread
----player thread: in playPlaylist
MAIN THREAD DONE
WR tempname: /tmp/mplayivgY4z
----player thread: about to go to sleep, js_state = 6, state = 110
exiting URL base with http://10.0.3.253/
signalling player from write
Signalling Player thread, state = 112, js_state = 6
---player thread: got wakeup signal, js_state = 6, state = 115
----player thread: playPlayList - waiting complete
----player thread: building command string
PLAY 0:mplayer
PLAY 0:-wid
PLAY 0:0x3a00adf
PLAY 0:-vf
PLAY 0:scale=240:-3
PLAY 0:-osdlevel
PLAY 0:1
PLAY 0:-nojoystick
PLAY 0:-noconsolecontrols
PLAY 0:-cookies
PLAY 0:-softvol
PLAY 0:-slave
----player thread:
local_list = 0x9929410
PL URL: http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
play = 1, cancelled= 0
next= (nil)
----player thread: set loop_count to -1
----player thread: entering loop. loop_count = -1
----player thread: looking for node to play
----player thread: play = 1 played = 0 entry = -1 fname = /tmp/mplayivgY4z
----player thread: chose url
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
----player thread: playing url:
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
----player thread: URL:
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
Starting: mplayer -wid 0x3a00adf -vf scale=240:-3 -osdlevel 1
-nojoystick -noconsolecontrols -cookies -softvol -slave -user-agent
NSPlayer -nomouseinput -cache 512 /tmp/mplayivgY4z
Getting file mode flags
READ: MPlayer 1.0rc2-4.2.3 (C) 2000-2007 MPlayer Team
READ: CPU: Intel(R) Pentium(R) 4 CPU 3.20GHz (Family: 15, Model: 3,
Stepping: 4)
READ: CPUflags: MMX: 1 MMX2: 1 3DNow: 0 3DNow2: 0 SSE: 1 SSE2: 1
READ: Compiled with runtime CPU detection.
READ: mplayer: could not connect to socket
READ: mplayer: No such file or directory
READ: Failed to open LIRC support. You will not be able to use your
remote control.
READ:
READ: Playing /tmp/mplayivgY4z.
READ:
READ: libavformat file format detected.
READ: [mp3 @ 0x8804034]Could not find codec parameters (Audio: mp1, 192
kb/s)
READ: LAVF_header: av_find_stream_info() failed
READ:
READ:
READ: Exiting... (End of file)
----player thread: breaking read loop - Exiting
local_url = http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
prefer_url = 0
----player thread: tryagain = 1
----player thread: playNode returned = 1
----player thread: played = 0 - /tmp/mplayivgY4z
----player thread: close done
----player thread: playing url:
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
----player thread: URL:
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
Starting: mplayer -wid 0x3a00adf -vf scale=240:-3 -osdlevel 1
-nojoystick -noconsolecontrols -cookies -softvol -slave -user-agent
NSPlayer -nomouseinput -cache 512
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg
drawing panel
height = 200 panel= 16
showbuttons = 1
showcontrols = 1
Getting file mode flags
READ: MPlayer 1.0rc2-4.2.3 (C) 2000-2007 MPlayer Team
READ: CPU: Intel(R) Pentium(R) 4 CPU 3.20GHz (Family: 15, Model: 3,
Stepping: 4)
READ: CPUflags: MMX: 1 MMX2: 1 3DNow: 0 3DNow2: 0 SSE: 1 SSE2: 1
READ: Compiled with runtime CPU detection.
READ: mplayer: could not connect to socket
READ: mplayer: No such file or directory
READ: Failed to open LIRC support. You will not be able to use your
remote control.
READ:
READ: Playing
http://10.0.3.253/nphMotionjpeg?resolution=320x240&bogus.mjpeg.
READ: Resolving 10.0.3.253 for AF_INET6...
READ: Couldn't resolve name for AF_INET6: 10.0.3.253
READ: Connecting to server 10.0.3.253[10.0.3.253]: 80...
READ: Cache size set to 512 KBytes
Setting file mode back to blocking
Cache fill: 18.75% (98304 bytes)
READ: Win32 LoadLibrary failed to load: avisynth.dll,
/usr/lib/win32/avisynth.dll, /usr/local/lib/win32/avisynth.dll
READ: libavformat file format detected.
READ: [lavf] Video stream found, -vid 0
READ: VIDEO: [MJPG] 320x240 0bpp 25.000 fps 0.0 kbps ( 0.0 kbyte/s)
READ: xscreensaver_disable: Could not find XScreenSaver window.
READ: GNOME screensaver disabled
READ: Opening video filter: [scale w=240 h=-3]
READ:
==========================================================================
READ: Opening video decoder: [ffmpeg] FFmpeg's libavcodec codec family
READ: Selected video codec: [ffmjpeg] vfm: ffmpeg (FFmpeg MJPEG decoder)
READ:
==========================================================================
READ: Audio: no sound
READ: Starting playback...
Setting file mode back to blocking
READ: VDec: vo config request - 320 x 240 (preferred colorspace: Planar
422P)
READ: VDec: using Planar 422P as output csp (no 1)
READ: Movie-Aspect is undefined - no prescaling applied.
READ: SwScaler: reducing / aligning filtersize 7 -> 8
READ: SwScaler: reducing / aligning filtersize 7 -> 8
READ: SwScaler: reducing / aligning filtersize 7 -> 6
READ: SwScaler: reducing / aligning filtersize 12 -> 11
READ: [swscaler @ 0x8934890]SwScaler: BICUBIC scaler, from yuv422p to
yuv420p using MMX2
READ: [swscaler @ 0x8934890]SwScaler: using 8-tap MMX scaler for
horizontal luminance scaling
READ: [swscaler @ 0x8934890]SwScaler: using 8-tap MMX scaler for
horizontal chrominance scaling
READ: [swscaler @ 0x8934890]SwScaler: using n-tap MMX scaler for
vertical scaling (YV12 like)
READ: [swscaler @ 0x8934890]SwScaler: 320x240 -> 240x180
READ: VO: [xv] 240x180 => 240x180 Planar YV12
----player thread: panel height in thread = 16
V: 1.0 25/ 2 12% 2% 0.0% 0 0 0%
ANS_LENGTH=0.00 0.0% 0 0 0%
READ: Failed to get value of property 'volume'.
in SetFullscreen with 0
fullscreen = 0
height = 200 and width = 240
V: 2.0 50/ 5 8% 2% 0.0% 0 0 0%
ANS_LENGTH=0.00 0.0% 0 0 0%
...I get repeated messages about the volume failure, but that doesn't
concern me and the video stream displays correctly.
Scott
Kevin DeKorte
Hash: SHA1
Scott Garman wrote:
> Kevin DeKorte wrote:
>> So I was looking at the code for both plugins and am not seeing anything
>> obvious that should cause this. Can you try the mplayerplug-in with
>> debug enabled and post the output (without nocache=1). BTW,
>> mplayerplug-in should work with that flag set as well.
>
> Ok. The first thing I'll note is that the mplayer plugin does not open
> mplayer in a separate window when I enable the nocache option. I've also
> tried testing this in a separate user account environment with an
> instance of Firefox that has no extensions installed with no difference
> (grasping at straws a bit here).
>
> Here is the debug output using the mplayer plugin without the nocache
> option (compare this to output from my 12/2 @ 4:29 PM EST email):
Ok, I don't see why mplayerplug-in is deciding to use the URL... but as
another test. Can you retest with gecko-mediaplayer and send me via
private mail or post somewhere the cached local copy...
The file with the name that looks something like, it will be different
each time.
/home/sgarman/.cache/gnome-mplayer/plugin/gecko-mediaplayerhoxkiv
I want to see why gnome-mplayer won't play that file. In fact can are
you testing from SVN or from the release versions?
If you can't post it anywhere, you can try running mplayer on it and
seeing what is reported.
Thanks,
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk4JZMACgkQ6w2kMH0L1dHnRwCeLCGN4Fx6xxmlI+zS6YjFUwa1
n6cAn3pxzMcq47rUjGD2crWvTSYIYdxH
=uvVT
-----END PGP SIGNATURE-----
Kevin DeKorte
Hash: SHA1
Scott Garman wrote:
> Kevin DeKorte wrote:
>> Ok, I don't see why mplayerplug-in is deciding to use the URL... but as
>> another test. Can you retest with gecko-mediaplayer and send me via
>> private mail or post somewhere the cached local copy...
>
> Sure, I copied the attached file after the stream had been open for a
> little under a minute. It does not play in gnome-mplayer or mplayer.
>
>> I want to see why gnome-mplayer won't play that file. In fact can are
>> you testing from SVN or from the release versions?
>
> Using 0.9.2 release. I can try it with the latest from svn if you think
> it would be useful.
Scott,
I took your sample and looked at it. I found how I can detect this and
autoswitch into nocache mode I believe. So grab SVN and you should be
able to use your page, without the nocache=1 option.
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk4OgMACgkQ6w2kMH0L1dErRgCfSqTvkC5KqmpvlB/euolaoNec
rywAnA8FDo+tOXKjnjC01PhQL6nWwUEW
=0ueh
-----END PGP SIGNATURE-----
Scott Garman
> I took your sample and looked at it. I found how I can detect this and
> autoswitch into nocache mode I believe. So grab SVN and you should be
> able to use your page, without the nocache=1 option.
It works! I am deeply grateful for this, Kevin. Thank you so much.
Scott
Kevin DeKorte
Hash: SHA1
You're welcome...
Kevin
- --
Get my public GnuPG key from
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7D0BD5D1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkk4Q6cACgkQ6w2kMH0L1dFaEQCbB8yLe9k/CHbQWXy3yenGK3S2
uukAoIZb3WsyEWbnThCjnw9iaXRGQkhn
=f1vy
-----END PGP SIGNATURE-----