[FFmpeg-devel] x11-grab error : Segmentation fault (core dumped)
I can use x11-grab to capture vnc screen with depth 16bit correctly. But with depth 24 or 32bit, it doesn’t work. I use this command: ffmpeg -f x11grab -video_size 1280x720 -framerate 25 -i :5 /tmp/out.yuv than, display this error: ffmpeg version N-64657-g2d91b3b Copyright (c) 2000-2014 the FFmpeg developers built on Jul 15 2014 03:18:27 with gcc 4.6 (Ubuntu/Linaro 4.6.3-1ubuntu5) libavutil 52. 92.100 / 52. 92.100 libavcodec 55. 69.100 / 55. 69.100 libavformat55. 46.100 / 55. 46.100 libavdevice55. 13.102 / 55. 13.102 libavfilter 4. 10.100 / 4. 10.100 libswscale 2. 6.100 / 2. 6.100 libswresample 0. 19.100 / 0. 19.100 libpostproc52. 3.100 / 52. 3.100 [x11grab @ 0xe8cd00] device: :5 -> display: :5 x: 0 y: 0 width: 1280 height: 720 [x11grab @ 0xe8cd00] shared memory extension found Segmentation fault (core dumped) The display info as below: xdpyinfo -display :5 name of display::5 version number:11.0 vendor string:The XFree86 Project, Inc vendor release number:4030 XFree86 version: 4.3.0 maximum request size: 4194300 bytes motion buffer size: 256 bitmap unit, bit order, padding:32, LSBFirst, 32 image byte order:LSBFirst number of supported pixmap formats:2 supported pixmap formats: depth 1, bits_per_pixel 1, scanline_pad 32 depth 32, bits_per_pixel 32, scanline_pad 32 keycode range:minimum 8, maximum 255 focus: window 0x4e, revert to PointerRoot number of extensions:24 BIG-REQUESTS DEC-XTRAP DOUBLE-BUFFER Extended-Visual-Information FontCache GLX LBX MIT-SCREEN-SAVER MIT-SHM MIT-SUNDRY-NONSTANDARD RANDR RECORD SECURITY SGI-GLX SHAPE SYNC TOG-CUP VNC-EXTENSION X-Resource XC-APPGROUP XC-MISC XFree86-Bigfont XTEST XVideo default screen number:0 number of screens:1 screen #0: dimensions:1280x720 pixels (325x183 millimeters) resolution:100x100 dots per inch depths (2):1, 32 root window id:0x2e depth of root window:32 planes number of colormaps:minimum 1, maximum 1 default colormap:0x21 default number of colormap cells:2048 preallocated pixels:black 0, white 4282370040 options:backing-store YES, save-unders YES largest cursor:1280x720 current input event mask:0xfa8033 KeyPressMask KeyReleaseMask EnterWindowMask LeaveWindowMask ExposureMask StructureNotifyMask SubstructureNotifyMask SubstructureRedirectMask FocusChangeMask PropertyChangeMask ColormapChangeMask number of visuals:8 default visual id: 0x24 visual: visual id:0x24 class:TrueColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x25 class:TrueColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x26 class:TrueColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x27 class:TrueColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x28 class:DirectColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x29 class:DirectColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x2a class:DirectColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits visual: visual id:0x2b class:DirectColor depth:32 planes available colormap entries:2048 per subfield red, green, blue masks:0x7ff, 0x3ff800, 0xffc0 significant bits in color specification:8 bits Thank you. Best Regard! Li Hui ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] new webpage design patches
On Mon, Jul 14, 2014 at 02:20:09AM +0200, Michael Niedermayer wrote: > Hi all > > Theres a pull request that modernises our webpage > https://github.com/FFmpeg/web/pull/1 > https://github.com/FFmpeg/FFmpeg/pull/77 > The new website can be previewed @ http://db0.galo.pe/ffmpeg-web/ (Note: all the pages are reworked, so feel free to browse the whole site) BTW, questions while I'm here: - about the donation page, the click&pledge is also related to SPI? Does it need the same warning as the two others? - should we restore the hall of shame page, or maybe simply add a "Violations" linking to a specific query in our trac? - I suggested "ffmpeg -i input.mp4 output.avi" for the discover command, but given how low the bitrate is by default, it's probably a bad idea, any suggestion? -- Clément B. pgp4Z59I7DbNT.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] disable compule_edt in case of filters
Le septidi 27 messidor, an CCXXII, Anshul a écrit : > User still have fix_sub_duration. Yes, but for that, they have to understand why changing something in the video filters did also change something in the subtitles encoding. > I was unable to frame ffmpeg command, when filter and transcoding both > done. Please help me if you know how can I do it. You can take the command from ticket #3768, output to a better format (Matroska) and add a stream in dvdsub format: "-map 0:s -c:s dvdsub". Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] x11-grab error : Segmentation fault (core dumped)
Le septidi 27 messidor, an CCXXII, Li Hui a écrit : > I can use x11-grab to capture vnc screen with depth 16bit correctly. But with > depth 24 or 32bit, it doesn’t work. > > I use this command: > ffmpeg -f x11grab -video_size 1280x720 -framerate 25 -i :5 /tmp/out.yuv > than, display this error: > ffmpeg version N-64657-g2d91b3b Copyright (c) 2000-2014 the FFmpeg developers ^^^ I can not find a commit with shorthash 2d91b3b in the current Git tree. Can you explain how you got your source tree exactly? An excerpt of "git log" would probably help. > [x11grab @ 0xe8cd00] device: :5 -> display: :5 x: 0 y: 0 width: 1280 height: > 720 > [x11grab @ 0xe8cd00] shared memory extension found > Segmentation fault (core dumped) > > The display info as below: > xdpyinfo -display :5 > screen #0: > dimensions:1280x720 pixels (325x183 millimeters) > resolution:100x100 dots per inch > depths (2):1, 32 Can you explain how you arrived to that configuration? I tried with my current X11 server (Intel HD), which has this: "depths (7): 24, 1, 4, 8, 15, 16, 32", and it works. Also, please remember to send bug-reports to the users' mailing-list unless you have a patch to fix them. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] lavd/x11grab: add an option to disable MIT-SHM.
With remote displays supporting the MIT-SHM extension,
the extension is detected and used, but attaching fails
asynchronously.
Signed-off-by: Nicolas George
---
doc/indevs.texi | 4
libavdevice/x11grab.c | 5 -
2 files changed, 8 insertions(+), 1 deletion(-)
It would probably be better to catch the XShmAttach() error, but that
requires more work. Maybe later.
diff --git a/doc/indevs.texi b/doc/indevs.texi
index 4205808..4ca12ff 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -895,6 +895,10 @@ ffmpeg -f x11grab -follow_mouse centered -show_region 1
-framerate 25 -video_siz
@item video_size
Set the video frame size. Default value is @code{vga}.
+
+@item use_shm
+Use the MIT-SHM extension for shared memory. Default value is @code{1}.
+It may be necessary to disable it for remote displays.
@end table
@c man end INPUT DEVICES
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index d38c55d..eb67799 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -166,7 +166,7 @@ x11grab_read_header(AVFormatContext *s1)
int x_off = 0;
int y_off = 0;
int screen;
-int use_shm;
+int use_shm = 0;
char *dpyname, *offset;
int ret = 0;
Colormap color_map;
@@ -223,8 +223,10 @@ x11grab_read_header(AVFormatContext *s1)
av_log(s1, AV_LOG_INFO, "followmouse is enabled, resetting grabbing
region to x: %d y: %d\n", x_off, y_off);
}
+if (x11grab->use_shm) {
use_shm = XShmQueryExtension(dpy);
av_log(s1, AV_LOG_INFO, "shared memory extension%s found\n", use_shm ? ""
: " not");
+}
if(use_shm) {
int scr = XDefaultScreen(dpy);
@@ -625,6 +627,7 @@ static const AVOption options[] = {
{ "framerate", "set video frame rate", OFFSET(framerate),
AV_OPT_TYPE_VIDEO_RATE, {.str = "ntsc"}, 0, 0, DEC },
{ "show_region", "show the grabbing region", OFFSET(show_region),
AV_OPT_TYPE_INT,{.i64 = 0}, 0, 1, DEC },
{ "video_size", "set video frame size", OFFSET(width),
AV_OPT_TYPE_IMAGE_SIZE, {.str = "vga"}, 0, 0, DEC },
+{ "use_shm", "use MIT-SHM extension",OFFSET(use_shm),
AV_OPT_TYPE_INT,{.i64 = 1}, 0, 1, DEC },
{ NULL },
};
--
2.0.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] x11-grab error : Segmentation fault (core dumped)
> I can not find a commit with shorthash 2d91b3b in the current Git tree. Can > you explain how you got your source tree exactly? An excerpt of "git log" > would probably help. I fork from 2a9b4c0 to add customize codec. > Can you explain how you arrived to that configuration? I tried with my > current X11 server (Intel HD), which has this: "depths (7): 24, 1, 4, 8, 15, > 16, 32", and it works. I use this command vncserver -geometry 1280x720 -depth 32 to get DISPLAY :5. Thank you a lot. On Jul 15, 2014, at 5:12 PM, Nicolas George wrote: > Le septidi 27 messidor, an CCXXII, Li Hui a écrit : >> I can use x11-grab to capture vnc screen with depth 16bit correctly. But >> with depth 24 or 32bit, it doesn’t work. >> >> I use this command: >> ffmpeg -f x11grab -video_size 1280x720 -framerate 25 -i :5 /tmp/out.yuv >> than, display this error: > >> ffmpeg version N-64657-g2d91b3b Copyright (c) 2000-2014 the FFmpeg developers > ^^^ > I can not find a commit with shorthash 2d91b3b in the current Git tree. Can > you explain how you got your source tree exactly? An excerpt of "git log" > would probably help. > >> [x11grab @ 0xe8cd00] device: :5 -> display: :5 x: 0 y: 0 width: 1280 height: >> 720 >> [x11grab @ 0xe8cd00] shared memory extension found >> Segmentation fault (core dumped) >> >> The display info as below: >> xdpyinfo -display :5 >> screen #0: >> dimensions:1280x720 pixels (325x183 millimeters) >> resolution:100x100 dots per inch >> depths (2):1, 32 > > Can you explain how you arrived to that configuration? I tried with my > current X11 server (Intel HD), which has this: "depths (7): 24, 1, 4, 8, 15, > 16, 32", and it works. > > Also, please remember to send bug-reports to the users' mailing-list unless > you have a patch to fix them. > > Regards, > > -- > Nicolas George > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/x11grab: add an option to disable MIT-SHM.
On Tue, Jul 15, 2014 at 11:40:16AM +0200, Nicolas George wrote: > With remote displays supporting the MIT-SHM extension, > the extension is detected and used, but attaching fails > asynchronously. > > Signed-off-by: Nicolas George > --- > doc/indevs.texi | 4 > libavdevice/x11grab.c | 5 - > 2 files changed, 8 insertions(+), 1 deletion(-) probably ok [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 2 "100% positive feedback" - "All either got their money back or didnt complain" "Best seller ever, very honest" - "Seller refunded buyer after failed scam" signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/x11grab: add an option to disable MIT-SHM.
Le septidi 27 messidor, an CCXXII, Michael Niedermayer a écrit : > probably ok Thanks. It looks like Xlib does not allow to make a really clean error handling. A suboptimal solution could probably be devised for this particular issue, but I feel it would not be worth it. To get something good, rewriting x11grab using xcb instead of Xlib would probably be the right way, but that is more work. So I will leave some time for other to comment, and then ask you to merge this commit if nobody objects. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] new webpage design patches
On Tue, Jul 15, 2014 at 10:10:41AM +0200, Clément Bœsch wrote: > On Mon, Jul 14, 2014 at 02:20:09AM +0200, Michael Niedermayer wrote: > > Hi all > > > > Theres a pull request that modernises our webpage > > https://github.com/FFmpeg/web/pull/1 > > https://github.com/FFmpeg/FFmpeg/pull/77 > > > > The new website can be previewed @ http://db0.galo.pe/ffmpeg-web/ > > (Note: all the pages are reworked, so feel free to browse the whole site) > > BTW, questions while I'm here: > > - about the donation page, the click&pledge is also related to SPI? Does >it need the same warning as the two others? its all SPI one way or another AFAIK click&pledge routes it to SPI-ffmpeg without extra precautions [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Dictatorship naturally arises out of democracy, and the most aggravated form of tyranny and slavery out of the most extreme liberty. -- Plato signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/4] lavf: add directory listing API
Le quartidi 24 messidor, an CCXXII, Lukasz Marek a écrit :
> TODO: bump minor, update doc/APIchanges
>
> API allows protocol implementations to provide API that
> allows to list directory content.
> API is similar to POSIX opendir/readdir/closedir.
>
> Signed-off-by: Lukasz Marek
> ---
> libavformat/avio.c | 76 +-
> libavformat/avio.h | 88
> +-
> libavformat/url.h | 55 ++
> 3 files changed, 217 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/avio.c b/libavformat/avio.c
> index 0a2a0a9..021ffc3 100644
> --- a/libavformat/avio.c
> +++ b/libavformat/avio.c
> @@ -23,12 +23,14 @@
> #include "libavutil/dict.h"
> #include "libavutil/opt.h"
> #include "libavutil/time.h"
> +#include "libavutil/avassert.h"
> #include "os_support.h"
> #include "avformat.h"
> #if CONFIG_NETWORK
> #include "network.h"
> #endif
> #include "url.h"
> +#include "avio_internal.h"
>
> static URLProtocol *first_protocol = NULL;
>
> @@ -286,6 +288,45 @@ fail:
> return ret;
> }
>
> +void ffurl_close_dir(URLContext *s)
> +{
> +if (s) {
> +if (s->prot->url_close_dir)
> +s->prot->url_close_dir(s);
> +ffurl_close(s);
> +}
> +}
Maybe ffurl_close_dirp(), and use ffurl_closep().
> +
> +int ffurl_open_dir(URLContext **s, const char *url,
> + const AVIOInterruptCB *int_cb, AVDictionary **options)
> +{
> +int ret;
> +
> +if ((ret = ffurl_alloc(s, url, AVIO_FLAG_READ, int_cb)) < 0)
> +return ret;
> +if (!(*s)->prot->url_open_dir || !(*s)->prot->url_read_dir ||
> !(*s)->prot->url_close_dir) {
> +ret = AVERROR(ENOSYS);
> +goto fail;
> +}
> +if ((*s)->prot->priv_data_class &&
> +(ret = av_opt_set_dict((*s)->priv_data, options)) < 0)
> +goto fail;
> +if ((ret = av_opt_set_dict(*s, options)) < 0)
> +goto fail;
> +if ((ret = (*s)->prot->url_open_dir(*s)) < 0)
> +goto fail;
> +return 0;
> + fail:
> +ffurl_close_dir(*s);
> +*s = NULL;
> +return ret;
> +}
> +
> +int ffurl_next_dir_entry(URLContext *s, const AVIODirEntry **next)
> +{
> +return s->prot->url_read_dir(s, next);
> +}
> +
> static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
> int size, int size_min,
> int (*transfer_func)(URLContext *h,
> @@ -389,7 +430,6 @@ int ffurl_close(URLContext *h)
> return ffurl_closep(&h);
> }
>
> -
> const char *avio_find_protocol_name(const char *url)
> {
> URLProtocol *p = url_find_protocol(url);
> @@ -416,6 +456,40 @@ int avio_check(const char *url, int flags)
> return ret;
> }
>
> +void avio_close_dir(AVIOContext *s)
> +{
> +if (s) {
> +ffurl_close_dir(s->opaque);
> +av_free(s);
> +}
> +}
Here and similarly for the other functions: do you think we need the
indirection avio_ -> ffurl_? It exist for the current API because the ffurl_
stuff used to be public, but I see no reason to make new code more complex
like that.
> +
> +int avio_open_dir(AVIOContext **s, const char *url,
> + const AVIOInterruptCB *int_cb, AVDictionary **options)
> +{
> +URLContext *h;
> +int ret;
> +av_assert0(s);
> +if ((ret = ffurl_open_dir(&h, url, int_cb, options)) < 0)
> +return ret;
> +
> +*s = avio_alloc_context(NULL, 0, h->flags, h, NULL, NULL, NULL);
> +if (!*s) {
> +avio_close_dir(*s);
> +return AVERROR(ENOMEM);
> +}
> +if (h->prot) {
> +(*s)->next_dir_entry = (int(*)(void *, const
> AVIODirEntry**))h->prot->url_read_dir;
> +}
> +(*s)->av_class = &ffio_url_class;
> +return 0;
> +}
> +
> +int avio_read_dir(AVIOContext *s, AVIODirEntry const **next)
> +{
> +return ffurl_next_dir_entry(s->opaque, next);
> +}
> +
> int64_t ffurl_size(URLContext *h)
> {
> int64_t pos, size;
> diff --git a/libavformat/avio.h b/libavformat/avio.h
> index 4004b6f..20fd32b 100644
> --- a/libavformat/avio.h
> +++ b/libavformat/avio.h
> @@ -34,7 +34,6 @@
>
> #include "libavformat/version.h"
>
> -
Spurious change.
> #define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file
> */
>
> /**
> @@ -54,6 +53,41 @@ typedef struct AVIOInterruptCB {
> } AVIOInterruptCB;
>
> /**
> + * Directory entry types.
> + */
> +enum AVIODirEntryType {
> +AVIO_ENTRY_UNKNOWN,
> +AVIO_ENTRY_BLOCK_DEVICE,
> +AVIO_ENTRY_CHARACTER_DEVICE,
> +AVIO_ENTRY_DIRECTORY,
> +AVIO_ENTRY_NAMED_PIPE,
> +AVIO_ENTRY_SYMBOLIC_LINK,
> +AVIO_ENTRY_SOCKET,
> +AVIO_ENTRY_FILE
> +};
Any reason for the order? IMHO, alphabetic would be better, and frequency
even better: FILE=0, then DIRECTORY, then the strange Unix stuff. Ans
UNKNOWN either last or special with -1.
> +
> +/**
> + * Describes single entry of the directory.
Re: [FFmpeg-devel] [PATCH] doc/utils: add missing `@c man end` title
On Mon, Jul 14, 2014 at 04:21:15PM -0700, Timothy Gu wrote: > Signed-off-by: Timothy Gu > --- > doc/utils.texi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/3] lavd/x11grab: disable drawing mouse without XFixes.
Fix a segfault if the XFixes extension is not available on
the X11 server.
Can be reproduced using the VNC server.
Signed-off-by: Nicolas George
---
libavdevice/x11grab.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index d38c55d..eb75e62 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -346,8 +346,9 @@ out:
* coordinates
*/
static void
-paint_mouse_pointer(XImage *image, struct x11grab *s)
+paint_mouse_pointer(XImage *image, AVFormatContext *s1)
{
+struct x11grab *s = s1->priv_data;
int x_off = s->x_off;
int y_off = s->y_off;
int width = s->width;
@@ -377,6 +378,12 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
XChangeWindowAttributes(dpy, w, CWCursor, &attr);
xcim = XFixesGetCursorImage(dpy);
+if (!xcim) {
+av_log(s1, AV_LOG_WARNING,
+ "XFixes extension not available, impossible to draw cursor\n");
+s->draw_mouse = 0;
+return;
+}
x = xcim->x - xcim->xhot;
y = xcim->y - xcim->yhot;
@@ -573,7 +580,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
}
if (s->draw_mouse) {
-paint_mouse_pointer(image, s);
+paint_mouse_pointer(image, s1);
}
return s->frame_size;
--
2.0.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 2/3] lavd/x11grab: change error code for unsupported visuals.
Signed-off-by: Nicolas George
---
libavdevice/x11grab.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index eb75e62..3a4aaeb 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -287,7 +287,7 @@ x11grab_read_header(AVFormatContext *s1)
} else {
av_log(s1, AV_LOG_ERROR, "RGB ordering at image depth %i not
supported ... aborting\n", image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b
0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
-ret = AVERROR(EIO);
+ret = AVERROR_PATCHWELCOME;
goto out;
}
break;
@@ -303,7 +303,7 @@ x11grab_read_header(AVFormatContext *s1)
} else {
av_log(s1, AV_LOG_ERROR,"rgb ordering at image depth %i not
supported ... aborting\n", image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b
0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
-ret = AVERROR(EIO);
+ret = AVERROR_PATCHWELCOME;
goto out;
}
break;
@@ -312,7 +312,7 @@ x11grab_read_header(AVFormatContext *s1)
break;
default:
av_log(s1, AV_LOG_ERROR, "image depth %i not supported ...
aborting\n", image->bits_per_pixel);
-ret = AVERROR(EINVAL);
+ret = AVERROR_PATCHWELCOME;
goto out;
}
--
2.0.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 3/3] lavd/x11grab: check 32-bits color masks.
The X11 servers by VNC, at 32-bits depths, has the following masks:
R:0x07ff G:0x003ff800 B:0xffc0
This is not compatible with AV_PIX_FMT_0RGB32, and the result
is success with completely wrong colors.
Signed-off-by: Nicolas George
---
libavdevice/x11grab.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 3a4aaeb..7271e6c 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -308,7 +308,16 @@ x11grab_read_header(AVFormatContext *s1)
}
break;
case 32:
-input_pixfmt = AV_PIX_FMT_0RGB32;
+if (image->red_mask == 0xff &&
+image->green_mask == 0x00ff00 &&
+image->blue_mask == 0xff ) {
+input_pixfmt = AV_PIX_FMT_0RGB32;
+} else {
+av_log(s1, AV_LOG_ERROR,"rgb ordering at image depth %i not
supported ... aborting\n", image->bits_per_pixel);
+av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b
0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
+ret = AVERROR_PATCHWELCOME;
+goto out;
+}
break;
default:
av_log(s1, AV_LOG_ERROR, "image depth %i not supported ...
aborting\n", image->bits_per_pixel);
--
2.0.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] x11-grab error : Segmentation fault (core dumped)
Le septidi 27 messidor, an CCXXII, Li Hui a écrit : > I fork from 2a9b4c0 to add customize codec. If you need help, you should try to use pristine Git, especially if it is not obvious to reproduce. > I use this command vncserver -geometry 1280x720 -depth 32 to get DISPLAY :5. Reproduced, analyzed and patch on the mailing-list. You can avoid the segfault using "-draw_mouse 0". But that will not make it usable for you: the VNC X11 server has a strange use of 32-bits color depths (11+11+10 bits for RGB while the most common is 8 bits per component plus 8 unused bits for alignment), that will result in completely wrong colors or, with my patches, an explicit error. > On Jul 15, 2014, at 5:12 PM, Nicolas George wrote: Please remember not to top-post on the ffmpeg mailing-lists; if you do not know what it means, look it up. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] avcodec/mjpegenc_common: always store JFIF, idependent of the aspect ratio
Found-by: kriegero1
Signed-off-by: Michael Niedermayer
---
libavcodec/mjpegenc_common.c | 20
tests/ref/lavf/jpg |4 ++--
tests/ref/lavf/smjpeg |4 ++--
tests/ref/vsynth/vsynth1-ljpeg |4 ++--
tests/ref/vsynth/vsynth1-mjpeg-422 |4 ++--
tests/ref/vsynth/vsynth1-mjpeg-444 |4 ++--
tests/ref/vsynth/vsynth2-ljpeg |4 ++--
tests/ref/vsynth/vsynth2-mjpeg |4 ++--
tests/ref/vsynth/vsynth2-mjpeg-422 |4 ++--
tests/ref/vsynth/vsynth2-mjpeg-444 |4 ++--
tests/ref/vsynth/vsynth3-ljpeg |4 ++--
tests/ref/vsynth/vsynth3-mjpeg |4 ++--
tests/ref/vsynth/vsynth3-mjpeg-422 |4 ++--
tests/ref/vsynth/vsynth3-mjpeg-444 |4 ++--
14 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 8a5b99f..8e77270 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -116,19 +116,23 @@ static void jpeg_put_comments(AVCodecContext *avctx,
PutBitContext *p)
int size;
uint8_t *ptr;
+/* JFIF header */
+put_marker(p, APP0);
+put_bits(p, 16, 16);
+avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
+put_bits(p, 16, 0x0102); /* v 1.02 */
+put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den >
0) {
-/* JFIF header */
-put_marker(p, APP0);
-put_bits(p, 16, 16);
-avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte
too */
-put_bits(p, 16, 0x0102); /* v 1.02 */
-put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
put_bits(p, 16, avctx->sample_aspect_ratio.num);
put_bits(p, 16, avctx->sample_aspect_ratio.den);
-put_bits(p, 8, 0); /* thumbnail width */
-put_bits(p, 8, 0); /* thumbnail height */
+} else {
+put_bits(p, 16, 1);
+put_bits(p, 16, 1);
}
+put_bits(p, 8, 0); /* thumbnail width */
+put_bits(p, 8, 0); /* thumbnail height */
+
/* comment */
if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
put_marker(p, COM);
diff --git a/tests/ref/lavf/jpg b/tests/ref/lavf/jpg
index 1309d74..2408a4c 100644
--- a/tests/ref/lavf/jpg
+++ b/tests/ref/lavf/jpg
@@ -1,3 +1,3 @@
-131878fee153a086d740543fbf2ab359 *./tests/data/images/jpg/02.jpg
+62ed0e74593827412d23cfdb8de60f8e *./tests/data/images/jpg/02.jpg
./tests/data/images/jpg/%02d.jpg CRC=0xe3509f33
-28406 ./tests/data/images/jpg/02.jpg
+28424 ./tests/data/images/jpg/02.jpg
diff --git a/tests/ref/lavf/smjpeg b/tests/ref/lavf/smjpeg
index a2eeb97..b2f9935 100644
--- a/tests/ref/lavf/smjpeg
+++ b/tests/ref/lavf/smjpeg
@@ -1,3 +1,3 @@
-a95982a2d390f4dcdc72a41d8920abb9 *./tests/data/lavf/lavf.smjpeg
-789551 ./tests/data/lavf/lavf.smjpeg
+ddee43a84eff0498651812d7c5ce2157 *./tests/data/lavf/lavf.smjpeg
+790001 ./tests/data/lavf/lavf.smjpeg
./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
diff --git a/tests/ref/vsynth/vsynth1-ljpeg b/tests/ref/vsynth/vsynth1-ljpeg
index 99bfade..d54fb9d 100644
--- a/tests/ref/vsynth/vsynth1-ljpeg
+++ b/tests/ref/vsynth/vsynth1-ljpeg
@@ -1,4 +1,4 @@
-24d72a5b4c0d3a49a30098369d56b1cc *tests/data/fate/vsynth1-ljpeg.avi
-6309478 tests/data/fate/vsynth1-ljpeg.avi
+be8db1648a32da470f9001321b8a357e *tests/data/fate/vsynth1-ljpeg.avi
+6310378 tests/data/fate/vsynth1-ljpeg.avi
c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ljpeg.out.rawvideo
stddev:0.00 PSNR:999.99 MAXDIFF:0 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-422
b/tests/ref/vsynth/vsynth1-mjpeg-422
index 3356dd3..f412018 100644
--- a/tests/ref/vsynth/vsynth1-mjpeg-422
+++ b/tests/ref/vsynth/vsynth1-mjpeg-422
@@ -1,4 +1,4 @@
-bcd2370d76f32b9eed7842685a04f29f *tests/data/fate/vsynth1-mjpeg-422.avi
-1756300 tests/data/fate/vsynth1-mjpeg-422.avi
+28e18bf36dfba82b2ebfe3f72699457c *tests/data/fate/vsynth1-mjpeg-422.avi
+1757200 tests/data/fate/vsynth1-mjpeg-422.avi
c35eea486c6d72050f4848eab64032b5
*tests/data/fate/vsynth1-mjpeg-422.out.rawvideo
stddev:7.45 PSNR: 30.69 MAXDIFF: 63 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-444
b/tests/ref/vsynth/vsynth1-mjpeg-444
index 5ebf895..78d3ff8 100644
--- a/tests/ref/vsynth/vsynth1-mjpeg-444
+++ b/tests/ref/vsynth/vsynth1-mjpeg-444
@@ -1,4 +1,4 @@
-f611f316df9b6890d6dcd3379691c36e *tests/data/fate/vsynth1-mjpeg-444.avi
-1989780 tests/data/fate/vsynth1-mjpeg-444.avi
+74ca2a9ce00a7e3d7edbe6393344c281 *tests/data/fate/vsynth1-mjpeg-444.avi
+1990680 tests/data/fate/vsynth1-mjpeg-444.avi
313a4a76af13d5879ea4910107b7ea74
*tests/data/fate/vsynth1-mjpeg-444.out.rawvideo
stddev:7.37 PSNR: 30.77 MAXDIFF: 63 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth2-ljpeg b/tests/ref/vsynth/vsynth2-ljpeg
index b59923e..118bc1c 100644
--- a/tests/ref/vsynth/vsy
Re: [FFmpeg-devel] [PATCH] avutil & avdevice: remove av_bprint_fd_contents()
Le sextidi 26 messidor, an CCXXII, Michael Niedermayer a écrit : > an alternative suggestion or after this patch > would be to switch to passing a filename string instead of a int fd > and treat "" as stdin "-" for stdin is more standard. Otherwise, it would be completely consistent with the av_file_map() function it intends to replace. But the name must be updated at the same time as the API. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Support for metadata in libavutil/eval.c
Le quintidi 25 messidor, an CCXXII, Stepan Bujnak a écrit : >Now, as far as I know the > expression evaluation is now optimized to only work with double values, > therefore the re-implementation of the expression evaluation to accept > string arguments would not be trivial and so I ask you, would such > functionality be helpful and welcome? As far as I know, the eval code is not optimized much: it just parses the expression into an abstract tree in memory with a lot of pointers. I believe the eval code would greatly benefit from a complete modernizing, both for usability and speed: - constant sub-expressions simplification; - rewrite the parser to have the full range of C operators: "a signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] One pass volume normalization (ebur128)
(Sorry for the thread necromancy.) Le septidi 17 prairial, an CCXXII, Roger Pack a écrit : > So am I correct that there is no smoothed intermediate value available > as of today? Indeed. Patch welcome. > One liners are just sexy if it were possible to do > volume normalization on the fly :) Volume normalization on the fly is possible with a long one-liner: ffmpeg ... -af volume="$(ffmpeg ... -af ebur128 | parse)" ... If the program is coherent, a constant volume adjustment is better, and it can only be achieved with two passes. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/3] lavd/x11grab: change error code for unsupported visuals.
On Tue, Jul 15, 2014 at 04:24:01PM +0200, Nicolas George wrote: > Signed-off-by: Nicolas George > --- > libavdevice/x11grab.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) LGTM [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 2 "100% positive feedback" - "All either got their money back or didnt complain" "Best seller ever, very honest" - "Seller refunded buyer after failed scam" signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 3/3] lavd/x11grab: check 32-bits color masks.
On Tue, Jul 15, 2014 at 04:24:02PM +0200, Nicolas George wrote: > The X11 servers by VNC, at 32-bits depths, has the following masks: > R:0x07ff G:0x003ff800 B:0xffc0 > This is not compatible with AV_PIX_FMT_0RGB32, and the result > is success with completely wrong colors. > > Signed-off-by: Nicolas George LGTM [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No snowflake in an avalanche ever feels responsible. -- Voltaire signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/3] lavd/x11grab: disable drawing mouse without XFixes.
On Tue, Jul 15, 2014 at 04:24:00PM +0200, Nicolas George wrote: > Fix a segfault if the XFixes extension is not available on > the X11 server. > Can be reproduced using the VNC server. > > Signed-off-by: Nicolas George > --- > libavdevice/x11grab.c | 11 +-- > 1 file changed, 9 insertions(+), 2 deletions(-) LGTM [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have never wished to cater to the crowd; for what I know they do not approve, and what they approve I do not know. -- Epicurus signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mjpegenc_common: always store JFIF, idependent of the aspect ratio
Thanks, with this change streaming HTTP MJPEG stream into browsers work (with inserting boundaries, which is easy for scripting). -- Andrey Utkin ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mjpegenc_common: always store JFIF, idependent of the aspect ratio
Le septidi 27 messidor, an CCXXII, Andrey Utkin a écrit : > Thanks, with this change streaming HTTP MJPEG stream into browsers > work (with inserting boundaries, which is easy for scripting). Can you share your test procedure please? Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] lavfi: check refcount before merging.
When merging the formats around the automatically inserted
convert filters, the refcount of the format lists can not be 0.
Coverity does not detect it, and suspects a memory leak,
because if refcount is 0 the newly allocated lists are not
stored anywhere. That gives CIDs 1224282, 1224283 and 1224284.
Lists with refcount 0 are used in can_merge_formats(), so the
asserts can not be moved inside the merge functions.
Signed-off-by: Nicolas George
---
libavfilter/avfiltergraph.c | 14 ++
1 file changed, 14 insertions(+)
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index f12491e..9178939 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -562,6 +562,20 @@ static int query_formats(AVFilterGraph *graph, AVClass
*log_ctx)
filter_query_formats(convert);
inlink = convert->inputs[0];
outlink = convert->outputs[0];
+av_assert0( inlink-> in_formats->refcount > 0);
+av_assert0( inlink->out_formats->refcount > 0);
+av_assert0(outlink-> in_formats->refcount > 0);
+av_assert0(outlink->out_formats->refcount > 0);
+if (outlink->type == AVMEDIA_TYPE_AUDIO) {
+av_assert0( inlink-> in_samplerates->refcount > 0);
+av_assert0( inlink->out_samplerates->refcount > 0);
+av_assert0(outlink-> in_samplerates->refcount > 0);
+av_assert0(outlink->out_samplerates->refcount > 0);
+av_assert0( inlink-> in_channel_layouts->refcount > 0);
+av_assert0( inlink->out_channel_layouts->refcount > 0);
+av_assert0(outlink-> in_channel_layouts->refcount > 0);
+av_assert0(outlink->out_channel_layouts->refcount > 0);
+}
if (!ff_merge_formats( inlink->in_formats,
inlink->out_formats, inlink->type) ||
!ff_merge_formats(outlink->in_formats,
outlink->out_formats, outlink->type))
ret = AVERROR(ENOSYS);
--
2.0.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mjpegenc_common: always store JFIF, idependent of the aspect ratio
2014-07-15 19:16 GMT+03:00 Nicolas George : > Le septidi 27 messidor, an CCXXII, Andrey Utkin a écrit : >> Thanks, with this change streaming HTTP MJPEG stream into browsers >> work (with inserting boundaries, which is easy for scripting). > > Can you share your test procedure please? I'll work on providing it tomorrow. -- Andrey Utkin ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavfi: check refcount before merging.
On Tue, Jul 15, 2014 at 07:30:35PM +0200, Nicolas George wrote: > When merging the formats around the automatically inserted > convert filters, the refcount of the format lists can not be 0. > Coverity does not detect it, and suspects a memory leak, > because if refcount is 0 the newly allocated lists are not > stored anywhere. That gives CIDs 1224282, 1224283 and 1224284. > Lists with refcount 0 are used in can_merge_formats(), so the > asserts can not be moved inside the merge functions. > > Signed-off-by: Nicolas George LGTM [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB DNS cache poisoning attacks, popular search engine, Google internet authority dont be evil, please signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avutil & avdevice: remove av_bprint_fd_contents()
On Sun, Jul 13, 2014 at 04:01:05PM +0200, Michael Niedermayer wrote: > MSVC does not allow passing file pointers between libs > This API can thus not work with MSVC and as it was very recently added > and its it was in no release its removial should not cause any problems > > Found-by: Hendrik Leppkes > Signed-off-by: Michael Niedermayer Applied so i dont need to keep it in the back of my head that i need to apply this before the release if no other solution has been commited [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have often repented speaking, but never of holding my tongue. -- Xenocrates signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v2] Blackframe video filter now sets metadata accordingly.
On Fri, Jul 11, 2014 at 11:40:07PM +0200, Stepan Bujnak wrote: > the libavfilter/vf_blackframe.c filter now not only logs detected > values, but also sets frame metadata. Currently, only `pblack` value is set > but `SET_META` macro has been introduced to ease development in the future. > > Signed-off-by: Stepan Bujnak > --- > Updated version that removes redundant values being set as metadata. > > libavfilter/vf_blackframe.c | 13 - > 1 file changed, 12 insertions(+), 1 deletion(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Republics decline into democracies and democracies degenerate into despotisms. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 2/2] Rebase commit 'web/download: remove developer repos and cleanup'
Commit cb17d7339c2a12d8bb36d3000f229d924e092d0c rebased Signed-off-by: Timothy Gu --- src/download | 205 --- 1 file changed, 27 insertions(+), 178 deletions(-) diff --git a/src/download b/src/download index 3ccbb3d..2f4ef59 100644 --- a/src/download +++ b/src/download @@ -179,7 +179,7 @@ -Extra Repositories +Git Repositories Since FFmpeg is developed with http://git-scm.com/";>Git, @@ -193,8 +193,6 @@ Clone URL Browse Snapshot - Admin - Commiters Description @@ -203,190 +201,41 @@ git://source.ffmpeg.org/ffmpeg.git http://git.videolan.org/?p=ffmpeg.git";>Browse http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz";>Snapshot - Michael Niedermayer - All FFmpeg developers - Main FFmpeg / libavcodec / libavformat / libavfilter / libavutil / libswscale / libswresample git repository, all work is merged in here, and it is the recommended repository for users and developers - to use. + Main FFmpeg Git repository git://ffmpeg.org/ffmpeg-web - - - Michael Niedermayer - All FFmpeg developers Main ffmpeg.org website repository + +git://git.ffmpeg.org/fateserver +- +- +http://fate.ffmpeg.org";>fate.ffmpeg.org server software repository + - Other Repositories - - - https://github.com/FFmpeg/FFmpeg";>https://github.com/FFmpeg/FFmpeg git://github.com/FFmpeg/FFmpeg.git - https://github.com/FFmpeg/FFmpeg";>Browse - https://github.com/FFmpeg/FFmpeg/archives/master";>Snapshot - - - - - Mirror of the main repository - - - git://git.libav.org/libav.git - http://git.libav.org/?p=libav.git";>Browse - http://git.libav.org/?p=libav.git;a=snapshot;h=HEAD;sf=tgz";>Snapshot - ? - 8 developers - - - - git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git - http://gitorious.org/~astrange/ffmpeg/ffmpeg-mt";>Browse - http://gitorious.org/ffmpeg/ffmpeg-mt/archive-tarball/master";>Snapshot - Alexander Strange - Alexander Strange - Multithreaded decoding - - - https://github.com/cehoyos/FFmpeg.git";>https://github.com/cehoyos/FFmpeg.git - https://github.com/cehoyos/FFmpeg.git";>Browse - - - Carl Eugen Hoyos - Carl Eugen Hoyos - - - - https://github.com/ubitux/FFmpeg.git";>https://github.com/ubitux/FFmpeg.git - https://github.com/ubitux/FFmpeg.git";>Browse - - - Clément Bœsch - Clément Bœsch - - - - https://github.com/dwbuiten/FFmpeg";>https://github.com/dwbuiten/FFmpeg - https://github.com/dwbuiten/FFmpeg";>Browse - - - Derek Buitenhuis - Derek Buitenhuis - - - - git://gitorious.org/~flameeyes/ffmpeg/flameeyes-ffmpeg.git - http://gitorious.org/~flameeyes/ffmpeg/flameeyes-ffmpeg";>Browse - http://gitorious.org/ffmpeg/flameeyes-ffmpeg/archive-tarball/master";>Snapshot - Diego E. Pettenò - Diego E. Pettenò - Personal repository with works in progress - - - git://git.1f0.de/ffmpeg.git - Browse - - - Hendrik Leppkes - Hendrik Leppkes - - - - https://github.com/josephwecker/FFmpeg.git";>https://github.com/josephwecker/FFmpeg.git - https://github.com/josephwecker/FFmpeg.git";>Browse - - - Joseph Wecker - Joseph Wecker - - - - git://github.com/justinruggles/Libav - http://justinruggles.github.com/Libav/";>Browse - - - Justin Ruggles - Justin Ruggles - Personal repository with works in progress - - - git://github.com/lu-zero/libav.git - https://github.com/lu-zero/libav";>Browse - https://github.com/lu-zero/libav/tarball/master";>Snapshot - Luca Barbato - Luca Barbato - Personal repository with works in progress and experiments - - - https://github.com/cus/ffplay.git";>https://github.com/cus/ffplay.git - https://github.com/cus/ffplay.git";>Browse - - - Marton Balint - Marton Balint - FFplay - - - https://github.com/mbouron/FFmpeg";>https://github.com/mbouron/FFmpeg - https://github.com/mbouron/FFmpeg";>Browse - - - Matthieu Bouron - Matthieu Bouron - - - - https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder";>https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder -
[FFmpeg-devel] [PATCH 0/2] Incremental patches for some small improvments
This patch series is also available at https://github.com/db0company/web/pull/1 , which also includes a commit that regenerates dist/ Timothy Gu (2): Make W3C validator happy Rebase commit 'web/download: remove developer repos and cleanup' src/about| 8 +- src/bugreports | 8 +- src/download | 211 +++ src/index| 4 +- src/template_footer1 | 2 +- src/template_head1 | 1 - 6 files changed, 40 insertions(+), 194 deletions(-) -- 1.9.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/2] Make W3C validator happy
Signed-off-by: Timothy Gu --- src/about| 8 src/bugreports | 8 src/download | 6 ++ src/index| 4 ++-- src/template_footer1 | 2 +- src/template_head1 | 1 - 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/about b/src/about index 665da5d..2ac11d6 100644 --- a/src/about +++ b/src/about @@ -39,9 +39,9 @@ - + - + FFmpeg Tools @@ -82,9 +82,9 @@ - + - + FFmpeg Libraries for developers diff --git a/src/bugreports b/src/bugreports index 68b61e0..70bf00a 100644 --- a/src/bugreports +++ b/src/bugreports @@ -99,9 +99,9 @@ - + - + Bug Tracker @@ -119,9 +119,9 @@ - + - + Submitting Sample Media diff --git a/src/download b/src/download index dd1221c..3ccbb3d 100644 --- a/src/download +++ b/src/download @@ -10,12 +10,10 @@ - - + If you find FFmpeg useful, you are welcome to contribute by donating. - - + More downloading options diff --git a/src/index b/src/index index 0b9483e..2acae24 100644 --- a/src/index +++ b/src/index @@ -27,12 +27,12 @@ - + https://plus.google.com/108003112428040046828?prsrc=3"; rel="publisher" style="text-decoration:none;"> https://twitter.com/FFmpeg";> - + News diff --git a/src/template_footer1 b/src/template_footer1 index d06b4a5..1d28d8a 100644 --- a/src/template_footer1 +++ b/src/template_footer1 @@ -1,5 +1,5 @@ - + diff --git a/src/template_head1 b/src/template_head1 index 204b17d..8197cd3 100644 --- a/src/template_head1 +++ b/src/template_head1 @@ -2,5 +2,4 @@ - -- 1.9.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Move old Changelog entries to doc/Changelog.old
On Sun, Jul 13, 2014 at 07:15:04PM -0700, Timothy Gu wrote: > Signed-off-by: Timothy Gu > --- > > Here is the right patch... > > Changelog | 1264 > - > doc/Changelog.old | 1229 +++ > 2 files changed, 1229 insertions(+), 1264 deletions(-) > delete mode 100644 Changelog > create mode 100644 doc/Changelog.old iam not sure this is a good idea the current changelog would then be in the release notes only and i assume would be overwritten with the next release notes for the next release maybe its better to leave the changelog as is and just build new release notes for each release [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I know you won't believe me, but the highest form of Human Excellence is to question oneself and others. -- Socrates signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Move old Changelog entries to doc/Changelog.old
On 15/07/14 6:52 PM, Michael Niedermayer wrote: > On Sun, Jul 13, 2014 at 07:15:04PM -0700, Timothy Gu wrote: >> Signed-off-by: Timothy Gu >> --- >> >> Here is the right patch... >> >> Changelog | 1264 >> - >> doc/Changelog.old | 1229 +++ >> 2 files changed, 1229 insertions(+), 1264 deletions(-) >> delete mode 100644 Changelog >> create mode 100644 doc/Changelog.old > > iam not sure this is a good idea > the current changelog would then be in the release notes only > and i assume would be overwritten with the next release notes for > the next release > > maybe its better to leave the changelog as is and just build new > release notes for each release +1 Lets keep changelog as is, updating it as usual, and then with each release we just copy the relevant latest changes to write RELEASE_NOTE. It will also make merges from libav easier and will prevent entries from being lost. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Move old Changelog entries to doc/Changelog.old
On Tue, Jul 15, 2014 at 2:56 PM, James Almer wrote: > On 15/07/14 6:52 PM, Michael Niedermayer wrote: >> On Sun, Jul 13, 2014 at 07:15:04PM -0700, Timothy Gu wrote: >>> Signed-off-by: Timothy Gu >>> --- >>> >>> Here is the right patch... >>> >>> Changelog | 1264 >>> - >>> doc/Changelog.old | 1229 >>> +++ >>> 2 files changed, 1229 insertions(+), 1264 deletions(-) >>> delete mode 100644 Changelog >>> create mode 100644 doc/Changelog.old >> >> iam not sure this is a good idea >> the current changelog would then be in the release notes only >> and i assume would be overwritten with the next release notes for >> the next release >> >> maybe its better to leave the changelog as is and just build new >> release notes for each release > > +1 > Lets keep changelog as is, updating it as usual, and then with each release we > just copy the relevant latest changes to write RELEASE_NOTE. > It will also make merges from libav easier and will prevent entries from being > lost. OK, patch dropped then. Timothy ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] lavf: Add WebM DASH Manifest Muxer
On Mon, Jul 14, 2014 at 09:52:23AM -0700, Vignesh Venkatasubramanian wrote: > This patch adds the ability to generate WebM DASH manifest XML using > ffmpeg. A sample command line would be as follows: > > ffmpeg \ > -f webm_dash_manifest -i video1.webm \ > -f webm_dash_manifest -i video2.webm \ > -f webm_dash_manifest -i audio1.webm \ > -f webm_dash_manifest -i audio2.webm \ > -map 0 -map 1 -map 2 -map 3 \ > -c copy \ > -f webm_dash_manifest \ > -adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \ > manifest.xml > > It works by exporting necessary fields as metadata tags in matroskadec > and use those values to write the appropriate XML fields as per the WebM > DASH Specification [1]. Some ideas are adopted from webm-tools project > [2]. > > [1] > https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification > [2] > https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/ > > Signed-off-by: Vignesh Venkatasubramanian > --- > Changelog | 1 + > doc/muxers.texi | 30 + > libavformat/Makefile | 11 +- > libavformat/allformats.c | 1 + > libavformat/version.h | 2 +- > libavformat/webmdashenc.c | 317 > ++ > 6 files changed, 359 insertions(+), 3 deletions(-) > create mode 100644 libavformat/webmdashenc.c applied maybe you want to send a patch which adds you to MAINTAINERs for this also please look into adding a fate test for this, without test id guess it wont work for long Thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you think the mosad wants you dead since a long time then you are either wrong or dead since a long time. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] diracdec: remove unused dsputil context
Signed-off-by: James Almer
---
libavcodec/diracdec.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index d1c3758..a18c867 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -27,7 +27,6 @@
*/
#include "avcodec.h"
-#include "dsputil.h"
#include "get_bits.h"
#include "bytestream.h"
#include "internal.h"
@@ -138,7 +137,6 @@ typedef struct Plane {
typedef struct DiracContext {
AVCodecContext *avctx;
-DSPContext dsp;
MpegvideoEncDSPContext mpvencdsp;
DiracDSPContext diracdsp;
GetBitContext gb;
@@ -425,7 +423,6 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
s->avctx = avctx;
s->frame_number = -1;
-ff_dsputil_init(&s->dsp, avctx);
ff_diracdsp_init(&s->diracdsp);
ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);
--
1.8.5.5
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] lavf/matroska: Add functions for WebM DASH Manifest
On Mon, Jul 07, 2014 at 12:52:37PM -0700, Vignesh Venkatasubramanian wrote: > Add functions and logic to matroskadec for use by the WebM DASH Manifest > XML Muxer. The actual muxer is added in a future patch. > > Signed-off-by: Vignesh Venkatasubramanian > --- > libavformat/matroska.h| 12 ++ > libavformat/matroskadec.c | 368 > ++ > 2 files changed, 380 insertions(+) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB In fact, the RIAA has been known to suggest that students drop out of college or go to community college in order to be able to afford settlements. -- The RIAA signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] diracdec: remove unused dsputil context
On Tue, Jul 15, 2014 at 07:10:09PM -0300, James Almer wrote: > Signed-off-by: James Almer > --- > libavcodec/diracdec.c | 3 --- > 1 file changed, 3 deletions(-) applied thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB When you are offended at any man's fault, turn to yourself and study your own failings. Then you will forget your anger. -- Epictetus signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] kCVPixelFormatType_OneComponent8 only exists from 10.8 onward
On Sun, Jul 13, 2014 at 09:55:38PM -0500, Hanspeter Niederstrasser wrote: > The AVFoundation indev uses kCVPixelFormatType_OneComponent8, but that > only exists on 10.8 and up. This puts it behind a #if. > > Hanspeter > > -- > Disclaimer: > By sending an email to ANY of my addresses you are agreeing that: > 1. I am by definition, "the intended recipient" > 2. All information in the email is mine to do with as I see fit and > make such financial profit, political mileage, or good joke as it > lends itself to. > 3. I may take the contents as representing the views of your company. > 4. This overrides any disclaimer or statement of confidentiality that > may be included with your message. > avfoundation.m |2 ++ > 1 file changed, 2 insertions(+) > a6de7b29755bdc29d21d552386add4539188983d > 0001-kCVPixelFormatType_OneComponent8-only-exists-from-10.patch > From c98dcb965030f959717b5d9643b4ed5ace7be229 Mon Sep 17 00:00:00 2001 > From: Hanspeter Niederstrasser > Date: Sun, 13 Jul 2014 21:49:24 -0500 > Subject: [PATCH] kCVPixelFormatType_OneComponent8 only exists from 10.8 > onward applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The worst form of inequality is to try to make unequal things equal. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] kCVPixelFormatType_OneComponent8 only exists from 10.8 onward
On Mon, Jul 14, 2014 at 08:57:36AM +0200, Reimar Döffinger wrote: > On 14.07.2014, at 04:55, Hanspeter Niederstrasser > wrote: > > The AVFoundation indev uses kCVPixelFormatType_OneComponent8, but that > > only exists on 10.8 and up. This puts it behind a #if. > > It's not ideal. Maybe not worth the effort, but it would be better if a > version compiled for older OSX could still use it if run on 10.8. > Requiring it to be compiled on 10.8 might be ok. > In other words, I think the check should be about whether the header provides > that definition, not what minimum OSX version we compile for. yes ive applied it though so its not causing build issues for the release [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Asymptotically faster algorithms should always be preferred if you have asymptotical amounts of data signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] drawtext: Add basic text shaping using libfribidi - Fixes ticket #3758
On Sat, Jun 21, 2014 at 05:41:45AM +0100, Marc Jeffreys wrote: > Regarding positioning of the '|' operator: Unless anyone objects, I think it's > fine being at the end of the line (if anything, that's the style used for '||' > in vf_drawtext.c). > > ---8<--- > --- > configure |3 + > doc/filters.texi | 11 > libavfilter/vf_drawtext.c | 123 ++-- > 3 files changed, 131 insertions(+), 6 deletions(-) applied maybe you want to send a patch that adds you to MAINTAINERs for fribidi thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have never wished to cater to the crowd; for what I know they do not approve, and what they approve I do not know. -- Epicurus signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [Report][SPI] Summary of donations and expenses in the first semester of 2014
See attachment. For some reasons the expense refunds were not accounted in the monthly SPI reports, so I had to interpolate the effective available deposit amount. -- FFmpeg = Formidable and Furious Mystic Peaceful Ecumenical Gladiator The following table shows the donations in the period 2014-01-01 - 2014-06-30 collected through SPI for the FFmpeg project. The name of the donors is omitted. Donations by Click&Pledge === DateAmount in US dollars Subtotal --- 2014-01-13 10.0010.00 2014-01-16 10.0020.00 2014-01-19 20.0040.00 2014-01-21 50.0090.00 2014-01-22 10.00 100.00 2014-01-24 5.00 105.00 2014-01-31 30.00 135.00 2014-01-31 50.00 185.00 2014-02-23 10.00 195.00 2014-04-01 25.00 220.00 2014-04-02 5.00 225.00 2014-04-09 200.00 425.00 2014-04-24 200.00 625.00 2014-04-291000.00 1625.00 2014-05-01 15.00 1640.00 2014-05-07 10.00 1650.00 2014-05-11 50.00 1700.00 2014-05-12 20.00 1720.00 2014-06-01 5.00 1725.00 2014-06-06 2.00 1727.00 2014-06-23 64.00 1791.00 2014-06-24 12.00 1803.00 Donations by bank transfers: === DateAmount in US dollars Subtotal --- none Expenses: January 2014 -- Processing Fees 8.99 SPI 5% 9.25 February 2014 -- Processing Fees 0.49 SPI 5% 0.50 March 2014 -- Processing Fees 0.00 SPI 5% 0.00 April 2014 -- Processing Fees 58.69 SPI 5% 71.50 May 2014 -- Processing Fees 5.20 SPI 5% 4.75 June 2014 -- Processing Fees 4.15 SPI 5% 4.15 = Total 167.67 USD Expenses who were not accounted in the official SPI reports: * Refund request for Chemnitzer Linux Tage 2014 (Thilo Borgmann): € 115.24 * Refund request for Chemnitzer Linux Tage 2014 and Berlin Linux Tage (Carl Eugen Hoyos): € 438.85 Total: € 554.09 ~= 753.56 USD (Considering a conversion rate of 1€ = 1.36 USD) Total asset in date 2013-12-31:2805.23 USD Total asset in date 2014-06-30 (Not considering unaccounted expenses): 4440.56 USD Corrected total asset in date 2014-06-30 (considering unaccounted expenses): (4440.56 - 753.56) USD = 3687.00 USD ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] videodsp: move draw_edges from mpegvideoencdsp
It's also used by some decoders
Signed-off-by: James Almer
---
configure | 4 +-
libavcodec/diracdec.c | 12 ++--
libavcodec/mpegvideo_enc.c| 8 +--
libavcodec/mpegvideoencdsp.c | 30
libavcodec/mpegvideoencdsp.h | 6 --
libavcodec/snow.c | 7 +-
libavcodec/snow.h | 1 -
libavcodec/snowenc.c | 2 +-
libavcodec/videodsp.c | 30
libavcodec/videodsp.h | 6 ++
libavcodec/x86/mpegvideoencdsp_init.c | 118
libavcodec/x86/videodsp_init.c| 124 +-
12 files changed, 175 insertions(+), 173 deletions(-)
diff --git a/configure b/configure
index 4ed43a0..47acef5 100755
--- a/configure
+++ b/configure
@@ -2048,7 +2048,7 @@ cook_decoder_select="audiodsp mdct sinewin"
cscd_decoder_select="lzo"
cscd_decoder_suggest="zlib"
dca_decoder_select="mdct"
-dirac_decoder_select="dsputil dwt golomb videodsp mpegvideoenc"
+dirac_decoder_select="dwt golomb videodsp qpeldsp"
dnxhd_decoder_select="blockdsp idctdsp"
dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc
pixblockdsp"
dvvideo_decoder_select="dvprofile idctdsp"
@@ -2157,7 +2157,7 @@ rv30_decoder_select="error_resilience golomb h264chroma
h264pred h264qpel mpeg_e
rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel
mpeg_er mpegvideo videodsp"
shorten_decoder_select="golomb"
sipr_decoder_select="lsp"
-snow_decoder_select="dsputil dwt h264qpel hpeldsp rangecoder mpegvideoenc"
+snow_decoder_select="dsputil dwt h264qpel hpeldsp rangecoder videodsp"
snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc
rangecoder"
sonic_decoder_select="golomb rangecoder"
sonic_encoder_select="golomb rangecoder"
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index a18c867..2d79aeb 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -137,7 +137,7 @@ typedef struct Plane {
typedef struct DiracContext {
AVCodecContext *avctx;
-MpegvideoEncDSPContext mpvencdsp;
+VideoDSPContext vdsp;
DiracDSPContext diracdsp;
GetBitContext gb;
dirac_source_params source;
@@ -424,7 +424,7 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
s->frame_number = -1;
ff_diracdsp_init(&s->diracdsp);
-ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);
+ff_videodsp_init(&s->vdsp, 8);
for (i = 0; i < MAX_FRAMES; i++) {
s->all_frames[i].avframe = av_frame_alloc();
@@ -1557,7 +1557,7 @@ static void interpolate_refplane(DiracContext *s,
DiracFrame *ref, int plane, in
int i, edge = EDGE_WIDTH/2;
ref->hpel[plane][0] = ref->avframe->data[plane];
-s->mpvencdsp.draw_edges(ref->hpel[plane][0],
ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP |
EDGE_BOTTOM); /* EDGE_TOP | EDGE_BOTTOM values just copied to make it build,
this needs to be ensured */
+s->vdsp.draw_edges(ref->hpel[plane][0], ref->avframe->linesize[plane],
width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM); /* EDGE_TOP | EDGE_BOTTOM
values just copied to make it build, this needs to be ensured */
/* no need for hpel if we only have fpel vectors */
if (!s->mv_precision)
@@ -1574,9 +1574,9 @@ static void interpolate_refplane(DiracContext *s,
DiracFrame *ref, int plane, in
s->diracdsp.dirac_hpel_filter(ref->hpel[plane][1], ref->hpel[plane][2],
ref->hpel[plane][3], ref->hpel[plane][0],
ref->avframe->linesize[plane], width,
height);
-s->mpvencdsp.draw_edges(ref->hpel[plane][1],
ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP |
EDGE_BOTTOM);
-s->mpvencdsp.draw_edges(ref->hpel[plane][2],
ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP |
EDGE_BOTTOM);
-s->mpvencdsp.draw_edges(ref->hpel[plane][3],
ref->avframe->linesize[plane], width, height, edge, edge, EDGE_TOP |
EDGE_BOTTOM);
+s->vdsp.draw_edges(ref->hpel[plane][1], ref->avframe->linesize[plane],
width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
+s->vdsp.draw_edges(ref->hpel[plane][2], ref->avframe->linesize[plane],
width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
+s->vdsp.draw_edges(ref->hpel[plane][3], ref->avframe->linesize[plane],
width, height, edge, edge, EDGE_TOP | EDGE_BOTTOM);
}
ref->interpolated[plane] = 1;
}
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index a4786b4..289fcd4 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1165,7 +1165,7 @@ static int load_input_picture(MpegEncContext *s, const
AVFrame *pic_arg)
}
}
if ((s->width & 15) || (s->height & (vpad-1))) {
-s->mpvencdsp.draw_edg
Re: [FFmpeg-devel] [PATCH] videodsp: move draw_edges from mpegvideoencdsp
Hi, On Tue, Jul 15, 2014 at 7:53 PM, James Almer wrote: > It's also used by some decoders > > Signed-off-by: James Almer > --- > configure | 4 +- > libavcodec/diracdec.c | 12 ++-- > libavcodec/mpegvideo_enc.c| 8 +-- > libavcodec/mpegvideoencdsp.c | 30 > libavcodec/mpegvideoencdsp.h | 6 -- > libavcodec/snow.c | 7 +- > libavcodec/snow.h | 1 - > libavcodec/snowenc.c | 2 +- > libavcodec/videodsp.c | 30 > libavcodec/videodsp.h | 6 ++ > libavcodec/x86/mpegvideoencdsp_init.c | 118 > > libavcodec/x86/videodsp_init.c| 124 > +- > 12 files changed, 175 insertions(+), 173 deletions(-) I have some pretty strong objections to this. We have measured in several high-quality and well-optimized decoders that using emulated_edge on-demand is _always_ faster than draw_edges. So why would we want any decoder to use draw_edges? Looks like cargo-cult to me. Also, I don't want vp8, vp9 or h264 to depend on draw_edges code. My suggestion is to remove draw_edges from the decoders still using it. It'll be faster. Ronald ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] RELEASE_NOTES: update
Signed-off-by: Timothy Gu --- RELEASE_NOTES | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 145abfa..4d76332 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -7,9 +7,10 @@ since the release of FFmpeg 2.2. In this release, there are lots of internal overhauls that make FFmpeg a - more accessible project for new developers. Many important new features - like QTKit and AVFoundation input devices are committed. Contributions done - by Libav such as a new native Opus decoder are also merged. + more accessible project for new developers. Many important new + optimizations and features like QTKit and AVFoundation input devices are + committed. Contributions done by Libav such as a new native Opus decoder + are also merged. Because of the increasing difficulty to maintain and lack of maintainers, we are very sorry to say that we have removed all Blackfin and SPARC @@ -17,8 +18,9 @@ interested in maintaining optimization for these two architecture, feel free to contact us and we will restore the code! - Since this release, the traditional Changelog file is upgraded to this - modern-looking release note. Old changelogs are moved to doc/Changelog.old. + Oh, and since this release, this modern-looking release note is provided in + addition to the old-style Changelog file, to make it easier for you to + focus on the most important features in this release. Enjoy! -- 1.9.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] videodsp: move draw_edges from mpegvideoencdsp
On 15/07/14 9:13 PM, Ronald S. Bultje wrote: > Hi, > > > On Tue, Jul 15, 2014 at 7:53 PM, James Almer wrote: > >> It's also used by some decoders >> >> Signed-off-by: James Almer >> --- >> configure | 4 +- >> libavcodec/diracdec.c | 12 ++-- >> libavcodec/mpegvideo_enc.c| 8 +-- >> libavcodec/mpegvideoencdsp.c | 30 >> libavcodec/mpegvideoencdsp.h | 6 -- >> libavcodec/snow.c | 7 +- >> libavcodec/snow.h | 1 - >> libavcodec/snowenc.c | 2 +- >> libavcodec/videodsp.c | 30 >> libavcodec/videodsp.h | 6 ++ >> libavcodec/x86/mpegvideoencdsp_init.c | 118 >> >> libavcodec/x86/videodsp_init.c| 124 >> +- >> 12 files changed, 175 insertions(+), 173 deletions(-) > > > I have some pretty strong objections to this. We have measured in several > high-quality and well-optimized decoders that using emulated_edge on-demand > is _always_ faster than draw_edges. So why would we want any decoder to use > draw_edges? Looks like cargo-cult to me. Also, I don't want vp8, vp9 or > h264 to depend on draw_edges code. > > My suggestion is to remove draw_edges from the decoders still using it. > It'll be faster. > > Ronald Fine by me. This was mostly a dependency removal effort. Your idea is probably cleaner overall. Patch dropped then. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] RELEASE_NOTES: update
On Tue, Jul 15, 2014 at 05:39:24PM -0700, Timothy Gu wrote: > Signed-off-by: Timothy Gu > --- > RELEASE_NOTES | 12 +++- > 1 file changed, 7 insertions(+), 5 deletions(-) applied thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Its not that you shouldnt use gotos but rather that you should write readable code and code with gotos often but not always is less readable signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] FFmpeg 2.3
On Wed, Jul 09, 2014 at 02:44:54AM +0200, Michael Niedermayer wrote: > Hi > > its been quite a while since FFmpeg 2.2, so high time to make > FFmpeg 2.3 > > if you want something in it, now is the time to push/post it > if you want something fixed, now is the time to fix it release made 2.3.1 will be made in 2 weeks probably [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 1 "Used only once"- "Some unspecified defect prevented a second use" "In good condition" - "Can be repaird by experienced expert" "As is" - "You wouldnt want it even if you were payed for it, if you knew ..." signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] diracdec: don't call ff_emulated_edge_mc_8 directly
Use the videodsp function pointer instead.
Signed-off-by: James Almer
---
libavcodec/diracdec.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index a18c867..30e6138 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -38,7 +38,7 @@
#include "dirac_dwt.h"
#include "dirac.h"
#include "diracdsp.h"
-#include "videodsp.h" // for ff_emulated_edge_mc_8
+#include "videodsp.h"
/**
* The spec limits the number of wavelet decompositions to 4 for both
@@ -73,8 +73,6 @@
*/
#define DELAYED_PIC_REF 4
-#define ff_emulated_edge_mc ff_emulated_edge_mc_8 /* Fix: change the calls to
this function regarding bit depth */
-
#define CALC_PADDING(size, depth) \
(((size + (1 << depth) - 1) >> depth) << depth)
@@ -138,6 +136,7 @@ typedef struct Plane {
typedef struct DiracContext {
AVCodecContext *avctx;
MpegvideoEncDSPContext mpvencdsp;
+VideoDSPContext vdsp;
DiracDSPContext diracdsp;
GetBitContext gb;
dirac_source_params source;
@@ -425,6 +424,7 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
ff_diracdsp_init(&s->diracdsp);
ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);
+ff_videodsp_init(&s->vdsp, 8);
for (i = 0; i < MAX_FRAMES; i++) {
s->all_frames[i].avframe = av_frame_alloc();
@@ -1451,10 +1451,10 @@ static int mc_subpel(DiracContext *s, DiracBlock
*block, const uint8_t *src[5],
y + p->yblen > p->height+EDGE_WIDTH/2 ||
x < 0 || y < 0) {
for (i = 0; i < nplanes; i++) {
-ff_emulated_edge_mc(s->edge_emu_buffer[i], src[i],
-p->stride, p->stride,
-p->xblen, p->yblen, x, y,
-p->width+EDGE_WIDTH/2, p->height+EDGE_WIDTH/2);
+s->vdsp.emulated_edge_mc(s->edge_emu_buffer[i], src[i],
+ p->stride, p->stride,
+ p->xblen, p->yblen, x, y,
+ p->width+EDGE_WIDTH/2,
p->height+EDGE_WIDTH/2);
src[i] = s->edge_emu_buffer[i];
}
}
--
1.8.5.5
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] lavf: Add WebM DASH Manifest Muxer
On Tue, Jul 15, 2014 at 3:08 PM, Michael Niedermayer wrote: > On Mon, Jul 14, 2014 at 09:52:23AM -0700, Vignesh Venkatasubramanian wrote: >> This patch adds the ability to generate WebM DASH manifest XML using >> ffmpeg. A sample command line would be as follows: >> >> ffmpeg \ >> -f webm_dash_manifest -i video1.webm \ >> -f webm_dash_manifest -i video2.webm \ >> -f webm_dash_manifest -i audio1.webm \ >> -f webm_dash_manifest -i audio2.webm \ >> -map 0 -map 1 -map 2 -map 3 \ >> -c copy \ >> -f webm_dash_manifest \ >> -adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \ >> manifest.xml >> >> It works by exporting necessary fields as metadata tags in matroskadec >> and use those values to write the appropriate XML fields as per the WebM >> DASH Specification [1]. Some ideas are adopted from webm-tools project >> [2]. >> >> [1] >> https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification >> [2] >> https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/ >> >> Signed-off-by: Vignesh Venkatasubramanian >> --- >> Changelog | 1 + >> doc/muxers.texi | 30 + >> libavformat/Makefile | 11 +- >> libavformat/allformats.c | 1 + >> libavformat/version.h | 2 +- >> libavformat/webmdashenc.c | 317 >> ++ >> 6 files changed, 359 insertions(+), 3 deletions(-) >> create mode 100644 libavformat/webmdashenc.c > > applied > > maybe you want to send a patch which adds you to MAINTAINERs for > this thanks, will do. > > also please look into adding a fate test for this, without test id > guess it wont work for long > yes. i am working on a fate test. will definitely send a patch it once i'm done. > Thanks > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > If you think the mosad wants you dead since a long time then you are either > wrong or dead since a long time. > > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > -- Vignesh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] diracdec: don't call ff_emulated_edge_mc_8 directly
On Tue, Jul 15, 2014 at 10:37:25PM -0300, James Almer wrote: > Use the videodsp function pointer instead. > > Signed-off-by: James Almer > --- > libavcodec/diracdec.c | 14 +++--- > 1 file changed, 7 insertions(+), 7 deletions(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The worst form of inequality is to try to make unequal things equal. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 2/3] vp9: remove unused assignment
Signed-off-by: Timothy Gu --- Already OK'd by BBB on IRC: 19:04 the first two seem correct 19:04 yeah they’re all correct 19:05 Timothy_Gu_: patch to remove these is fine --- libavcodec/vp9.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 56975bd..96da823 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -2479,7 +2479,6 @@ static void intra_recon(AVCodecContext *ctx, ptrdiff_t y_off, ptrdiff_t uv_off) } // U/V -h4 >>= 1; w4 >>= 1; end_x >>= 1; end_y >>= 1; @@ -2760,8 +2759,6 @@ static void inter_recon(AVCodecContext *ctx) } // uv itxfm add -h4 >>= 1; -w4 >>= 1; end_x >>= 1; end_y >>= 1; step = 1 << (b->uvtx * 2); -- 1.9.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/3] get_bits: remove unused assignment
Signed-off-by: Timothy Gu
---
libavcodec/get_bits.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index d8d7b6e..fd32535 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -408,7 +408,7 @@ static inline int init_get_bits(GetBitContext *s, const
uint8_t *buffer,
int ret = 0;
if (bit_size >= INT_MAX - 7 || bit_size < 0 || !buffer) {
-buffer_size = bit_size = 0;
+bit_size= 0;
buffer = NULL;
ret = AVERROR_INVALIDDATA;
}
--
1.9.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 3/3] aaccoder: remove unused assignment
Signed-off-by: Timothy Gu
---
libavcodec/aaccoder.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 50a246f..37548aa 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -776,7 +776,6 @@ static void search_for_quantizers_twoloop(AVCodecContext
*avctx,
do {
int prev = -1;
tbits = 0;
-fflag = 0;
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
start = w*128;
for (g = 0; g < sce->ics.num_swb; g++) {
@@ -953,7 +952,6 @@ static void search_for_quantizers_faac(AVCodecContext
*avctx, AACEncContext *s,
}
sce->zeroes[w*16+g] = 0;
scf = prev_scf = av_clip(SCALE_ONE_POS - SCALE_DIV_512 -
log2f(1/maxq[w*16+g])*16/3, 60, 218);
-step = 16;
for (;;) {
float dist = 0.0f;
int quant_max;
--
1.9.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] kCVPixelFormatType_OneComponent8only exists from 10.8 onward
On 14.07.2014, at 15:21, Carl Eugen Hoyos wrote: > Reimar Döffinger gmx.de> writes: > >> In other words, I think the check should be about whether >> the header provides that definition, not what minimum OSX >> version we compile for. > > Isn't this exactly what the check does? It checks __MAC_OS_X_VERSION_MIN_REQUIRED, as far as I know that is the OSX version you compile _for_ (i.e. you probably can't even start the program on anything older), not the version you compile _on_. Though I do not know how clearly these are separated in the OSX toolchain. We'd really want a way that allows using this format if running at 10.8 but still makes it possible to run the binary on 10.6. If they did it stupidly it might only be possible by providing a definition ourselves. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mjpegenc_common: always store JFIF, idependent of the aspect ratio
On 15.07.2014, at 16:31, Michael Niedermayer wrote: > Found-by: kriegero1 > Signed-off-by: Michael Niedermayer Nit: iNdependent in commit message. > +/* JFIF header */ > +put_marker(p, APP0); > +put_bits(p, 16, 16); > +avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too > */ > +put_bits(p, 16, 0x0102); /* v 1.02 */ > +put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ Would an empty JFIF header possibly help as well? (I think it's a collection of tags or am I wrong and it requires an aspect entry?) I don't like specifying a 1:1 aspect explicitly when we actually don't know it. Also, might the diff be more readable without reindenting? ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mjpegenc_common: always store JFIF, idependent of the aspect ratio
On 15.07.2014, at 18:14, Andrey Utkin wrote: > Thanks, with this change streaming HTTP MJPEG stream into browsers > work (with inserting boundaries, which is easy for scripting). oh, and please add an explanation like this (assuming this is the reason for it) to the commit message. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
